patch-2.1.8 linux/include/linux/hdreg.h

• Lines: 28
• Date: Thu Nov 7 19:51:20 1996
• Orig file: v2.1.7/linux/include/linux/hdreg.h
• Orig date: Mon Sep 30 11:19:00 1996

diff -u --recursive --new-file v2.1.7/linux/include/linux/hdreg.h linux/include/linux/hdreg.h
@@ -101,6 +101,7 @@
 #define HDIO_SET_NOWERR		0x0325	/* change ignore-write-error flag */
 #define HDIO_SET_DMA		0x0326	/* change use-dma flag */
 #define HDIO_SET_PIO_MODE	0x0327	/* reconfig interface to new speed */
+#define HDIO_SCAN_HWIF		0x0328	/* register and (re)scan interface */
 
 /* structure returned by HDIO_GET_IDENTITY, as per ANSI ATA2 rev.2f spec */
 struct hd_driveid {
@@ -162,15 +163,15 @@
 #ifdef CONFIG_BLK_DEV_HD
 void hd_setup(char *, int *);
 #endif	/* CONFIG_BLK_DEV_HD */
+
 #ifdef CONFIG_BLK_DEV_IDE
 void ide_setup(char *);
+#endif	/* CONFIG_BLK_DEV_IDE */
 
-#ifdef CONFIG_BLK_DEV_IDE_PCMCIA
+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 int ide_register(int io_port, int ctl_port, int irq);
 void ide_unregister(unsigned int);
-#endif  /* CONFIG_BLK_DEV_IDE_PCMCIA */
-
-#endif	/* CONFIG_BLK_DEV_IDE */
+#endif /* CONFIG_BLK_DEV_IDE || CONFIG_BLK_DEV_IDE_MODULE */
 
 #endif  /* __KERNEL__ */