---

yaml --- r: 139873 b: refs/heads/master c: dafd01c h: refs/heads/master i: 139871: 22bcb87 v: v3
git-mirror · Apr 1, 2009 · 82a3901 · 82a3901
1 parent e6213c7
commit 82a3901
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;