2 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h
index e38e75967e74..c37e9241fae7 100644
--- a/include/linux/hdreg.h
+++ b/include/linux/hdreg.h
@@ -422,9 +422,11 @@ struct hd_geometry {
 #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 */
+#ifndef __KERNEL__
 #define HDIO_SCAN_HWIF          0x0328  /* register and (re)scan interface */
-#define HDIO_SET_NICE           0x0329  /* set nice flags */
 #define HDIO_UNREGISTER_HWIF    0x032a  /* unregister interface */
+#endif
+#define HDIO_SET_NICE           0x0329  /* set nice flags */
 #define HDIO_SET_WCACHE         0x032b  /* change write cache enable-disable */
 #define HDIO_SET_ACOUSTIC       0x032c  /* change acoustic behavior */
 #define HDIO_SET_BUSSTATE       0x032d  /* set the bus state of the hwif */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 67f83c60845f..478ddf7e21d5 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1191,7 +1191,7 @@ static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {}
 void ide_remove_port_from_hwgroup(ide_hwif_t *);
 extern int ide_hwif_request_regions(ide_hwif_t *hwif);
 extern void ide_hwif_release_regions(ide_hwif_t* hwif);
-void ide_unregister(unsigned int, int, int);
+void ide_unregister(unsigned int);
 
 void ide_register_region(struct gendisk *);
 void ide_unregister_region(struct gendisk *);