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
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
include
/
asm-ia64
/
ide.h
diff --git
a/include/asm-ia64/ide.h
b/include/asm-ia64/ide.h
index
778d69e
..
e62b953
100644
(file)
--- a/
include/asm-ia64/ide.h
+++ b/
include/asm-ia64/ide.h
@@
-25,6
+25,8
@@
# endif
#endif
# endif
#endif
+#define IDE_ARCH_OBSOLETE_DEFAULTS
+
static inline int ide_default_irq(unsigned long base)
{
switch (base) {
static inline int ide_default_irq(unsigned long base)
{
switch (base) {
@@
-53,6
+55,9
@@
static inline unsigned long ide_default_io_base(int index)
}
}
}
}
+#define IDE_ARCH_OBSOLETE_INIT
+#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
+
#ifdef CONFIG_PCI
#define ide_init_default_irq(base) (0)
#else
#ifdef CONFIG_PCI
#define ide_init_default_irq(base) (0)
#else