X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-m32r%2Fide.h;h=f7aa96970d180c7389a272ea0b8b583ca1ca8325;hb=a2308b7f0838406c346a2b0259ff88c7fcf41e79;hp=194393bd8beb8f07eee63a375211c34350efc603;hpb=8066eff0a1a0703ad901dbe5646a47dbfc089ef2;p=linux-2.6 diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h index 194393bd8b..f7aa96970d 100644 --- a/include/asm-m32r/ide.h +++ b/include/asm-m32r/ide.h @@ -25,18 +25,21 @@ # endif #endif -#if defined(CONFIG_PLAT_M32700UT) -#include -#include -#endif +#include + #define IDE_ARCH_OBSOLETE_DEFAULTS static __inline__ int ide_default_irq(unsigned long base) { switch (base) { -#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3) +#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) + case 0x1f0: return PLD_IRQ_CFIREQ; + default: + return 0; +#elif defined(CONFIG_PLAT_MAPPI3) case 0x1f0: return PLD_IRQ_CFIREQ; + case 0x170: return PLD_IRQ_IDEIREQ; default: return 0; #else