diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /include/linux/hdsmart.h | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/linux/hdsmart.h')
| -rw-r--r-- | include/linux/hdsmart.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
| 17 | #ifndef _LINUX_HDSMART_H | 17 | #ifndef _LINUX_HDSMART_H |
| 18 | #define _LINUX_HDSMART_H | 18 | #define _LINUX_HDSMART_H |
| 19 | 19 | ||
| 20 | #ifndef __KERNEL | 20 | #ifndef __KERNEL__ |
| 21 | #define OFFLINE_FULL_SCAN 0 | 21 | #define OFFLINE_FULL_SCAN 0 |
| 22 | #define SHORT_SELF_TEST 1 | 22 | #define SHORT_SELF_TEST 1 |
| 23 | #define EXTEND_SELF_TEST 2 | 23 | #define EXTEND_SELF_TEST 2 |
| @@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s { | |||
| 121 | unsigned char resevered[2]; | 121 | unsigned char resevered[2]; |
| 122 | unsigned char chksum; | 122 | unsigned char chksum; |
| 123 | } __attribute__ ((packed)) ata_smart_selftestlog_t; | 123 | } __attribute__ ((packed)) ata_smart_selftestlog_t; |
| 124 | #endif /* __KERNEL__ * | 124 | #endif /* __KERNEL__ */ |
| 125 | 125 | ||
| 126 | #endif /* _LINUX_HDSMART_H */ | 126 | #endif /* _LINUX_HDSMART_H */ |