X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Fasm-m32r%2Fide.h;h=5d2044e529abc0e562a8eee0338e70c06834eed8;hb=b1d08ac064268d0ae2281e98bf5e82627e0f0c56;hp=c82ebe8f250d6fadc84b913a1a48fc9af13bceab;hpb=40b20c257a13c5a526ac540bc5e43d0fdf29792a;p=~andy%2Flinux

diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h
index c82ebe8f250..5d2044e529a 100644
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -1,8 +1,6 @@
 #ifndef _ASM_M32R_IDE_H
 #define _ASM_M32R_IDE_H
 
-/* $Id$ */
-
 /*
  *  linux/include/asm-m32r/ide.h
  *
@@ -15,6 +13,7 @@
 
 #ifdef __KERNEL__
 
+#include <asm/m32r.h>
 
 #ifndef MAX_HWIFS
 # ifdef CONFIG_BLK_DEV_IDEPCI
@@ -24,9 +23,6 @@
 # endif
 #endif
 
-#include <asm/m32r.h>
-
-
 #define IDE_ARCH_OBSOLETE_DEFAULTS
 
 static __inline__ int ide_default_irq(unsigned long base)
@@ -69,7 +65,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