diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 1 | ||||
| -rw-r--r-- | include/linux/string.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 507f53ef8038..f5441edee55f 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -372,6 +372,7 @@ enum { | |||
| 372 | ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */ | 372 | ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */ |
| 373 | ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */ | 373 | ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */ |
| 374 | ATA_HORKAGE_STUCK_ERR = (1 << 9), /* stuck ERR on next PACKET */ | 374 | ATA_HORKAGE_STUCK_ERR = (1 << 9), /* stuck ERR on next PACKET */ |
| 375 | ATA_HORKAGE_BRIDGE_OK = (1 << 10), /* no bridge limits */ | ||
| 375 | 376 | ||
| 376 | /* DMA mask for user DMA control: User visible values; DO NOT | 377 | /* DMA mask for user DMA control: User visible values; DO NOT |
| 377 | renumber */ | 378 | renumber */ |
diff --git a/include/linux/string.h b/include/linux/string.h index 810d80df0a1d..d18fc198aa2f 100644 --- a/include/linux/string.h +++ b/include/linux/string.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef _LINUX_STRING_H_ | 1 | #ifndef _LINUX_STRING_H_ |
| 2 | #define _LINUX_STRING_H_ | 2 | #define _LINUX_STRING_H_ |
| 3 | 3 | ||
| 4 | /* We don't want strings.h stuff being user by user stuff by accident */ | 4 | /* We don't want strings.h stuff being used by user stuff by accident */ |
| 5 | 5 | ||
| 6 | #ifndef __KERNEL__ | 6 | #ifndef __KERNEL__ |
| 7 | #include <string.h> | 7 | #include <string.h> |