git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-m32r
/
ide.h
diff --git
a/include/asm-m32r/ide.h
b/include/asm-m32r/ide.h
index
be64f24
..
f7aa969
100644
(file)
--- a/
include/asm-m32r/ide.h
+++ b/
include/asm-m32r/ide.h
@@
-25,10
+25,8
@@
# endif
#endif
# endif
#endif
-#if defined(CONFIG_PLAT_M32700UT)
-#include <asm/irq.h>
-#include <asm/m32700ut/m32700ut_pld.h>
-#endif
+#include <asm/m32r.h>
+
#define IDE_ARCH_OBSOLETE_DEFAULTS
#define IDE_ARCH_OBSOLETE_DEFAULTS
@@
-39,6
+37,11
@@
static __inline__ int ide_default_irq(unsigned long base)
case 0x1f0: return PLD_IRQ_CFIREQ;
default:
return 0;
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
case 0x1f0: return 14;
case 0x170: return 15;
#else
case 0x1f0: return 14;
case 0x170: return 15;