summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz2008-02-19 01:41:26 +0100
committerBartlomiej Zolnierkiewicz2008-02-19 01:41:26 +0100
commitf401fd55b5a9ef1a4572abaefaa6957af11ced61 (patch)
tree68531b239999ba0ac68154294b4cbf3fae235458 /include/linux
parentvia82cxxx: add new PCI id for cx700 (diff)
downloadkernel-qcow2-linux-f401fd55b5a9ef1a4572abaefaa6957af11ced61.tar.gz
kernel-qcow2-linux-f401fd55b5a9ef1a4572abaefaa6957af11ced61.tar.xz
kernel-qcow2-linux-f401fd55b5a9ef1a4572abaefaa6957af11ced61.zip
linux/hdsmart.h: fix goofups (take 2)
Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c ("<linux/hdsmart.h> is not used by kernel code"). Also update include/linux/Kbuild to reflect the fact that hdsmart.h uses __KERNEL__ ifdefs now. Reported-by: "Robert P. J. Day" <rpjday@crashcourse.ca> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/Kbuild2
-rw-r--r--include/linux/hdsmart.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 5cae9b5960ea..aada32fffec2 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -70,7 +70,6 @@ header-y += fuse.h
header-y += genetlink.h
header-y += gen_stats.h
header-y += gigaset_dev.h
-header-y += hdsmart.h
header-y += hysdn_if.h
header-y += i2o-dev.h
header-y += i8k.h
@@ -211,6 +210,7 @@ unifdef-y += hayesesp.h
unifdef-y += hdlcdrv.h
unifdef-y += hdlc.h
unifdef-y += hdreg.h
+unifdef-y += hdsmart.h
unifdef-y += hiddev.h
unifdef-y += hpet.h
unifdef-y += i2c.h
diff --git a/include/linux/hdsmart.h b/include/linux/hdsmart.h
index e69192159d40..4f4faf9d4238 100644
--- a/include/linux/hdsmart.h
+++ b/include/linux/hdsmart.h
@@ -17,7 +17,7 @@
#ifndef _LINUX_HDSMART_H
#define _LINUX_HDSMART_H
-#ifndef __KERNEL
+#ifndef __KERNEL__
#define OFFLINE_FULL_SCAN 0
#define SHORT_SELF_TEST 1
#define EXTEND_SELF_TEST 2
@@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s {
unsigned char resevered[2];
unsigned char chksum;
} __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ *
+#endif /* __KERNEL__ */
#endif /* _LINUX_HDSMART_H */