diff --git a/[refs] b/[refs]
index 3f2326f738e4..dfc32ccef554 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aaf2fec718f6fbf38668edf733a0ab09a49cab1
+refs/heads/master: 6fd5c665d8fe9da5f2081f0b3ca8054f0f730b1a
diff --git a/trunk/include/linux/hdreg.h b/trunk/include/linux/hdreg.h
index ed21bd3dbd25..47fcb05af8b4 100644
--- a/trunk/include/linux/hdreg.h
+++ b/trunk/include/linux/hdreg.h
@@ -448,6 +448,7 @@ enum {
 
 #define __NEW_HD_DRIVE_ID
 
+#ifndef __KERNEL__
 /*
  * Structure returned by HDIO_GET_IDENTITY, as per ANSI NCITS ATA6 rev.1b spec.
  *
@@ -699,6 +700,7 @@ struct hd_driveid {
 					 *  7:0 Signature
 					 */
 };
+#endif /* __KERNEL__ */
 
 /*
  * IDE "nice" flags. These are used on a per drive basis to determine