9 files changed, 11 insertions, 25 deletions
diff --git a/include/asm-alpha/hdreg.h b/include/asm-alpha/hdreg.h
index 2d9454754910..81d8a40802c3 100644
--- a/include/asm-alpha/hdreg.h
+++ b/include/asm-alpha/hdreg.h
@@ -7,6 +7,6 @@
 #ifndef __ASMalpha_HDREG_H
 #define __ASMalpha_HDREG_H
 
-typedef unsigned short ide_ioreg_t;
+typedef unsigned long ide_ioreg_t;
 
 #endif /* __ASMalpha_HDREG_H */
diff --git a/include/asm-arm/hdreg.h b/include/asm-arm/hdreg.h
index a2d301dd5361..81bc05e16260 100644
--- a/include/asm-arm/hdreg.h
+++ b/include/asm-arm/hdreg.h
@@ -7,7 +7,7 @@
 #ifndef __ASMARM_HDREG_H
 #define __ASMARM_HDREG_H
 
-typedef unsigned int ide_ioreg_t;
+typedef unsigned long ide_ioreg_t;
 
 #endif /* __ASMARM_HDREG_H */
 
diff --git a/include/asm-i386/hdreg.h b/include/asm-i386/hdreg.h
index 1ad5c073941c..4760b0453b8e 100644
--- a/include/asm-i386/hdreg.h
+++ b/include/asm-i386/hdreg.h
@@ -7,6 +7,6 @@
 #ifndef __ASMi386_HDREG_H
 #define __ASMi386_HDREG_H
 
-typedef unsigned short ide_ioreg_t;
+typedef unsigned long ide_ioreg_t;
 
 #endif /* __ASMi386_HDREG_H */
diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
index 6e78191eaa81..3f307acc50bd 100644
--- a/include/asm-i386/ide.h
+++ b/include/asm-i386/ide.h
@@ -77,20 +77,6 @@ static __inline__ void ide_init_default_hwifs(void)
 #endif
 }
 
-#define ide_request_irq(irq,hand,flg,dev,id)	request_irq((irq),(hand),(flg),(dev),(id))
-#define ide_free_irq(irq,dev_id)		free_irq((irq), (dev_id))
-#define ide_check_region(from,extent)		check_region((from), (extent))
-#define ide_request_region(from,extent,name)	request_region((from), (extent), (name))
-#define ide_release_region(from,extent)		release_region((from), (extent))
-
-/*
- * The following are not needed for the non-m68k ports
- */
-#define ide_ack_intr(hwif)		(1)
-#define ide_fix_driveid(id)		do {} while (0)
-#define ide_release_lock(lock)		do {} while (0)
-#define ide_get_lock(lock, hdlr, data)	do {} while (0)
-
 #endif /* __KERNEL__ */
 
 #endif /* __ASMi386_IDE_H */
diff --git a/include/asm-parisc/hdreg.h b/include/asm-parisc/hdreg.h
index 629b220f2df0..f934c760bf0e 100644
--- a/include/asm-parisc/hdreg.h
+++ b/include/asm-parisc/hdreg.h
@@ -1,6 +1,6 @@
 #ifndef _ASM_HDREG_H
 #define _ASM_HDREG_H
 
-typedef unsigned short ide_ioreg_t;
+typedef unsigned long ide_ioreg_t;
 
 #endif
diff --git a/include/asm-ppc/hdreg.h b/include/asm-ppc/hdreg.h
index 9506c8293a4a..db83c662f3f0 100644
--- a/include/asm-ppc/hdreg.h
+++ b/include/asm-ppc/hdreg.h
@@ -14,7 +14,7 @@
 #ifndef __ASMPPC_HDREG_H
 #define __ASMPPC_HDREG_H
 
-typedef unsigned int ide_ioreg_t;
+typedef unsigned long ide_ioreg_t;
 
 #endif /* __ASMPPC_HDREG_H */
 
diff --git a/include/asm-sh/hdreg.h b/include/asm-sh/hdreg.h
index 1d417a15c17c..9112275e05f8 100644
--- a/include/asm-sh/hdreg.h
+++ b/include/asm-sh/hdreg.h
@@ -7,6 +7,6 @@
 #ifndef __ASM_SH_HDREG_H
 #define __ASM_SH_HDREG_H
 
-typedef unsigned int ide_ioreg_t;
+typedef unsigned long ide_ioreg_t;
 
 #endif /* __ASM_SH_HDREG_H */
diff --git a/include/asm-x86_64/hdreg.h b/include/asm-x86_64/hdreg.h
index 7de6fcf98f85..6ca37a9778de 100644
--- a/include/asm-x86_64/hdreg.h
+++ b/include/asm-x86_64/hdreg.h
@@ -7,6 +7,6 @@
 #ifndef __ASMx86_64_HDREG_H
 #define __ASMx86_64_HDREG_H
 
-typedef unsigned short ide_ioreg_t;
+typedef unsigned long ide_ioreg_t;
 
 #endif /* __ASMx86_64_HDREG_H */
diff --git a/include/asm-x86_64/ide.h b/include/asm-x86_64/ide.h
index b2ad635bdf94..f6620abade97 100644
--- a/include/asm-x86_64/ide.h
+++ b/include/asm-x86_64/ide.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-i386/ide.h
+ *  linux/include/asm-x86_64/ide.h
  *
  *  Copyright (C) 1994-1996  Linus Torvalds & authors
  */
@@ -8,8 +8,8 @@
  *  This file contains the i386 architecture specific IDE code.
  */
 
-#ifndef __ASMi386_IDE_H
-#define __ASMi386_IDE_H
+#ifndef __ASMx86_64_IDE_H
+#define __ASMx86_64_IDE_H
 
 #ifdef __KERNEL__
 
@@ -79,4 +79,4 @@ static __inline__ void ide_init_default_hwifs(void)
 
 #endif /* __KERNEL__ */
 
-#endif /* __ASMi386_IDE_H */
+#endif /* __ASMx86_64_IDE_H */