Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerpc: merge ide.h

Browse Source 
This is very simple with it being almost all ppc32 with just a couple
of common defines.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell 2005-11-08 12:20:34 +11:00 committed by Paul Mackerras
parent 515729ece1
commit b354cab076
2 changed files with 20 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/asm-ppc/ide.h → include/asm-powerpc/ide.h
View File

@ -1,24 +1,27 @@
/* /*
* linux/include/asm-ppc/ide.h * Copyright (C) 1994-1996 Linus Torvalds & authors
* *
* Copyright (C) 1994-1996 Linus Torvalds & authors */ * This file contains the powerpc architecture specific IDE code.
/*
* This file contains the ppc architecture specific IDE code.
*/ */
#ifndef _ASM_POWERPC_IDE_H
#ifndef __ASMPPC_IDE_H #define _ASM_POWERPC_IDE_H
#define __ASMPPC_IDE_H
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __powerpc64__
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/mpc8xx.h> #include <asm/mpc8xx.h>
#ifndef MAX_HWIFS
#define MAX_HWIFS 8
#endif #endif
#ifndef MAX_HWIFS
#ifdef __powerpc64__
#define MAX_HWIFS 10
#else
#define MAX_HWIFS 8
#endif
#endif
#ifndef __powerpc64__
#include <linux/config.h> #include <linux/config.h>
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/ioport.h> #include <linux/ioport.h>
@ -59,9 +62,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
return 0; return 0;
} }
#define IDE_ARCH_OBSOLETE_INIT
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define ide_init_default_irq(base) (0) #define ide_init_default_irq(base) (0)
#else #else
@ -73,6 +73,11 @@ static __inline__ unsigned long ide_default_io_base(int index)
#define ide_ack_intr(hwif) (hwif->hw.ack_intr ? hwif->hw.ack_intr(hwif) : 1) #define ide_ack_intr(hwif) (hwif->hw.ack_intr ? hwif->hw.ack_intr(hwif) : 1)
#endif #endif
#endif /* __powerpc64__ */
#define IDE_ARCH_OBSOLETE_INIT
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASMPPC_IDE_H */ #endif /* _ASM_POWERPC_IDE_H */

30
include/asm-ppc64/ide.h
View File

@ -1,30 +0,0 @@
/*
* linux/include/asm-ppc/ide.h
*
* Copyright (C) 1994-1996 Linus Torvalds & authors
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
/*
* This file contains the ppc64 architecture specific IDE code.
*/
#ifndef __ASMPPC64_IDE_H
#define __ASMPPC64_IDE_H
#ifdef __KERNEL__
#ifndef MAX_HWIFS
# define MAX_HWIFS 10
#endif
#define IDE_ARCH_OBSOLETE_INIT
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#endif /* __KERNEL__ */
#endif /* __ASMPPC64_IDE_H */