From df9b57fa1c59c7b150c8e681fc834904060e586a Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl>
Date: Tue, 13 Apr 2004 04:29:30 -0700
Subject: [PATCH] [PATCH] obsolete asm/hdreg.h

---
 include/asm-generic/hdreg.h   |  2 ++
 include/asm-h8300/hdreg.h     |  2 ++
 include/asm-i386/hdreg.h      | 12 +-----------
 include/asm-ia64/hdreg.h      |  2 ++
 include/asm-m68k/hdreg.h      | 12 +-----------
 include/asm-ppc/ide.h         |  2 --
 include/asm-sparc/ide.h       |  1 -
 include/asm-sparc64/ide.h     |  1 -
 include/asm-v850/rte_me2_cb.h |  2 +-
 include/asm-x86_64/hdreg.h    | 11 +----------
 include/linux/ide.h           |  1 -
 11 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/include/asm-generic/hdreg.h b/include/asm-generic/hdreg.h
index f6ecba25ccfb4..7051fba8bcf94 100644
--- a/include/asm-generic/hdreg.h
+++ b/include/asm-generic/hdreg.h
@@ -1,3 +1,5 @@
+#warning <asm/hdreg.h> is obsolete, please do not use it
+
 #ifndef __ASM_GENERIC_HDREG_H
 #define __ASM_GENERIC_HDREG_H
 
diff --git a/include/asm-h8300/hdreg.h b/include/asm-h8300/hdreg.h
index f98b5cde57204..36d0c06687d81 100644
--- a/include/asm-h8300/hdreg.h
+++ b/include/asm-h8300/hdreg.h
@@ -4,6 +4,8 @@
  *  Copyright (C) 1994-1996  Linus Torvalds & authors
  */
 
+#warning this file is obsolete, please do not use it
+
 #ifndef _H8300_HDREG_H
 #define _H8300_HDREG_H
 
diff --git a/include/asm-i386/hdreg.h b/include/asm-i386/hdreg.h
index 2fc154c1e1c79..5989bbc97cbf9 100644
--- a/include/asm-i386/hdreg.h
+++ b/include/asm-i386/hdreg.h
@@ -1,11 +1 @@
-/*
- *  linux/include/asm-i386/hdreg.h
- *
- *  Copyright (C) 1994-1996  Linus Torvalds & authors
- */
-
-#ifndef __ASMi386_HDREG_H
-#define __ASMi386_HDREG_H
-
-
-#endif /* __ASMi386_HDREG_H */
+#warning this file is obsolete, please do not use it
diff --git a/include/asm-ia64/hdreg.h b/include/asm-ia64/hdreg.h
index 62e422faf58f0..83b5161d2678f 100644
--- a/include/asm-ia64/hdreg.h
+++ b/include/asm-ia64/hdreg.h
@@ -4,6 +4,8 @@
  *  Copyright (C) 1994-1996  Linus Torvalds & authors
  */
 
+#warning this file is obsolete, please do not use it
+
 #ifndef __ASM_IA64_HDREG_H
 #define __ASM_IA64_HDREG_H
 
diff --git a/include/asm-m68k/hdreg.h b/include/asm-m68k/hdreg.h
index 214152b84ace0..5989bbc97cbf9 100644
--- a/include/asm-m68k/hdreg.h
+++ b/include/asm-m68k/hdreg.h
@@ -1,11 +1 @@
-/*
- *  linux/include/asm-m68k/hdreg.h
- *
- *  Copyright (C) 1994-1996  Linus Torvalds & authors
- */
-
-#ifndef _M68K_HDREG_H
-#define _M68K_HDREG_H
-
-
-#endif /* _M68K_HDREG_H */
+#warning this file is obsolete, please do not use it
diff --git a/include/asm-ppc/ide.h b/include/asm-ppc/ide.h
index c91629cae9383..dc65c07b12bf4 100644
--- a/include/asm-ppc/ide.h
+++ b/include/asm-ppc/ide.h
@@ -19,8 +19,6 @@
 #define MAX_HWIFS	8
 #endif
 
-#include <asm/hdreg.h>
-
 #include <linux/config.h>
 #include <linux/hdreg.h>
 #include <linux/ioport.h>
diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h
index fbc50ae1d67ad..f3106e9219431 100644
--- a/include/asm-sparc/ide.h
+++ b/include/asm-sparc/ide.h
@@ -14,7 +14,6 @@
 #include <linux/config.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
-#include <asm/hdreg.h>
 #include <asm/psr.h>
 
 #undef  MAX_HWIFS
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h
index 4f5164a663530..0ab79f859599d 100644
--- a/include/asm-sparc64/ide.h
+++ b/include/asm-sparc64/ide.h
@@ -13,7 +13,6 @@
 #include <linux/config.h>
 #include <asm/pgalloc.h>
 #include <asm/io.h>
-#include <asm/hdreg.h>
 #include <asm/page.h>
 #include <asm/spitfire.h>
 
diff --git a/include/asm-v850/rte_me2_cb.h b/include/asm-v850/rte_me2_cb.h
index bdb7df71410ee..9922c85c85a83 100644
--- a/include/asm-v850/rte_me2_cb.h
+++ b/include/asm-v850/rte_me2_cb.h
@@ -147,7 +147,7 @@ extern void cb_pic_init_irqs (void);
 #define CB_UART_REG_GAP 	0x10
 #define CB_UART_CLOCK   	0x16000000
 
-/* CompactFlash setting see also asm/ide.h, asm/hdreg.h.  */
+/* CompactFlash setting */
 #define CB_CF_BASE     		0x0FE0C000
 #define CB_CF_CCR_ADDR 		(CB_CF_BASE+0x200)
 #define CB_CF_CCR      		(*(volatile u8 *)CB_CF_CCR_ADDR)
diff --git a/include/asm-x86_64/hdreg.h b/include/asm-x86_64/hdreg.h
index 52a2ed303fcf7..5989bbc97cbf9 100644
--- a/include/asm-x86_64/hdreg.h
+++ b/include/asm-x86_64/hdreg.h
@@ -1,10 +1 @@
-/*
- *  linux/include/asm-x86_64/hdreg.h
- *
- *  Copyright (C) 1994-1996  Linus Torvalds & authors
- */
-
-#ifndef __ASMx86_64_HDREG_H
-#define __ASMx86_64_HDREG_H
-
-#endif /* __ASMx86_64_HDREG_H */
+#warning this file is obsolete, please do not use it
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 8031fe68521a5..5da715ef383b4 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -20,7 +20,6 @@
 #include <linux/pci.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
-#include <asm/hdreg.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
 
-- 
2.53.0