Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[cascardo/linux.git] / include / asm-x86 / ide.h

diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h
index e7817a3..c2552d8 100644 (file)
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -1,6 +1,4 @@
 /*
- *  linux/include/asm-i386/ide.h
- *
  *  Copyright (C) 1994-1996  Linus Torvalds & authors
  */
 
@@ -62,7 +60,6 @@ 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_BLK_DEV_IDEPCI