Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / include / linux / hdsmart.h

diff --git a/include/linux/hdsmart.h b/include/linux/hdsmart.h
index 7974a47fe58257d2fb3308443f025f1413383bbf..e69192159d40bf174923b420b7a9c3c7c19bea45 100644 (file)
--- a/include/linux/hdsmart.h
+++ b/include/linux/hdsmart.h
@@ -17,6 +17,7 @@
 #ifndef _LINUX_HDSMART_H
 #define _LINUX_HDSMART_H
 
+#ifndef __KERNEL
 #define OFFLINE_FULL_SCAN              0
 #define SHORT_SELF_TEST                        1
 #define EXTEND_SELF_TEST               2
@@ -120,5 +121,6 @@ typedef struct ata_smart_selftestlog_s {
        unsigned char                   resevered[2];
        unsigned char                   chksum;
 } __attribute__ ((packed)) ata_smart_selftestlog_t;
+#endif /* __KERNEL__ *
 
 #endif /* _LINUX_HDSMART_H */