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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-m32r
/
ide.h
diff --git
a/include/asm-m32r/ide.h
b/include/asm-m32r/ide.h
index
f7aa969
..
c82ebe8
100644
(file)
--- a/
include/asm-m32r/ide.h
+++ b/
include/asm-m32r/ide.h
@@
-15,7
+15,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
@@
-33,7
+32,8
@@
static __inline__ int ide_default_irq(unsigned long base)
{
switch (base) {
static __inline__ int ide_default_irq(unsigned long base)
{
switch (base) {
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2)
+#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
+ || defined(CONFIG_PLAT_OPSPUT)
case 0x1f0: return PLD_IRQ_CFIREQ;
default:
return 0;
case 0x1f0: return PLD_IRQ_CFIREQ;
default:
return 0;