From 82a3901f184e71a5bb516e5002090885c5cd9706 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Wed, 1 Apr 2009 21:42:25 +0200
Subject: [PATCH] --- yaml --- r: 139873 b: refs/heads/master c:
 dafd01cc14a38690c87981eb2670d9c95f799ffd h: refs/heads/master i:   139871:
 22bcb87e98794ee089802624a2b9778c09a87aaf v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/hdreg.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6c5fcd3afbb2..0b8b3c59442e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04b3ab52a000ab7e718efc97e9fdd67d95002d11
+refs/heads/master: dafd01cc14a38690c87981eb2670d9c95f799ffd
diff --git a/trunk/include/linux/hdreg.h b/trunk/include/linux/hdreg.h
index 47fcb05af8b4..101eb91de22f 100644
--- a/trunk/include/linux/hdreg.h
+++ b/trunk/include/linux/hdreg.h
@@ -191,6 +191,7 @@ typedef struct hd_drive_hob_hdr {
 #define TASKFILE_INVALID		0x7fff
 #endif
 
+#ifndef __KERNEL__
 /* ATA/ATAPI Commands pre T13 Spec */
 #define WIN_NOP				0x00
 /*
@@ -379,6 +380,7 @@ typedef struct hd_drive_hob_hdr {
 #define SECURITY_ERASE_UNIT		0xBD
 #define SECURITY_FREEZE_LOCK		0xBE
 #define SECURITY_DISABLE_PASSWORD	0xBF
+#endif /* __KERNEL__ */
 
 struct hd_geometry {
       unsigned char heads;