diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:33 -0400 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:33 -0400 |
| commit | 0e33555fffdc8490630d98070e76e5fe031bcac2 (patch) | |
| tree | 74ef5a7427db1deef3994a0342767bf0b4ffafe1 /include/asm-powerpc/ide.h | |
| parent | 359c2e2d2039029a8167fb00499296b228928024 (diff) | |
ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS (take 2)
* Add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS to drivers/ide/Kconfig and use
it instead of defining IDE_ARCH_OBSOLETE_DEFAULTS in <arch/ide.h>.
v2:
* Define ide_default_irq() in ide-probe.c/ns87415.c if not already defined
and drop defining ide_default_irq() for CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS=n.
[ Thanks to Stephen Rothwell and David Miller for noticing the problem. ]
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/asm-powerpc/ide.h')
| -rw-r--r-- | include/asm-powerpc/ide.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h index 06549456c953..fef2ef1dbe86 100644 --- a/include/asm-powerpc/ide.h +++ b/include/asm-powerpc/ide.h | |||
| @@ -31,8 +31,6 @@ | |||
| 31 | #include <linux/hdreg.h> | 31 | #include <linux/hdreg.h> |
| 32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
| 33 | 33 | ||
| 34 | #define IDE_ARCH_OBSOLETE_DEFAULTS | ||
| 35 | |||
| 36 | /* FIXME: use ide_platform host driver */ | 34 | /* FIXME: use ide_platform host driver */ |
| 37 | static __inline__ int ide_default_irq(unsigned long base) | 35 | static __inline__ int ide_default_irq(unsigned long base) |
| 38 | { | 36 | { |