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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
asm-i386
/
ide.h
diff --git
a/include/asm-i386/ide.h
b/include/asm-i386/ide.h
index
e241be6
..
0409c22
100644
(file)
--- a/
include/asm-i386/ide.h
+++ b/
include/asm-i386/ide.h
@@
-23,6
+23,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) {
@@
-85,6
+87,9
@@
static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_por
}
#endif
}
#endif
+#define IDE_ARCH_OBSOLETE_INIT
+#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
+
#ifdef CONFIG_BLK_DEV_IDEPCI
#define ide_init_default_irq(base) (0)
#else
#ifdef CONFIG_BLK_DEV_IDEPCI
#define ide_init_default_irq(base) (0)
#else