diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-01-19 15:56:50 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-01-19 15:56:50 -0500 |
| commit | 282f445a779ed76fca9884fe377bf56a3088b208 (patch) | |
| tree | d9abcf526baee0100672851e0a8894c19e762a39 /include/linux/patchkey.h | |
| parent | 68f30fbee19cc67849b9fa8e153ede70758afe81 (diff) | |
| parent | 90a4c0f51e8e44111a926be6f4c87af3938a79c3 (diff) | |
Merge remote-tracking branch 'linus/master' into x86/urgent
Diffstat (limited to 'include/linux/patchkey.h')
| -rw-r--r-- | include/linux/patchkey.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/patchkey.h b/include/linux/patchkey.h index d974a6e92372..aefda0ec6e62 100644 --- a/include/linux/patchkey.h +++ b/include/linux/patchkey.h | |||
| @@ -32,7 +32,8 @@ | |||
| 32 | # else | 32 | # else |
| 33 | # error "could not determine byte order" | 33 | # error "could not determine byte order" |
| 34 | # endif | 34 | # endif |
| 35 | #elif defined(__BYTE_ORDER) | 35 | #else |
| 36 | #if defined(__BYTE_ORDER) | ||
| 36 | # if __BYTE_ORDER == __BIG_ENDIAN | 37 | # if __BYTE_ORDER == __BIG_ENDIAN |
| 37 | # define _PATCHKEY(id) (0xfd00|id) | 38 | # define _PATCHKEY(id) (0xfd00|id) |
| 38 | # elif __BYTE_ORDER == __LITTLE_ENDIAN | 39 | # elif __BYTE_ORDER == __LITTLE_ENDIAN |
| @@ -41,5 +42,6 @@ | |||
| 41 | # error "could not determine byte order" | 42 | # error "could not determine byte order" |
| 42 | # endif | 43 | # endif |
| 43 | #endif | 44 | #endif |
| 45 | #endif | ||
| 44 | 46 | ||
| 45 | #endif /* _LINUX_PATCHKEY_H */ | 47 | #endif /* _LINUX_PATCHKEY_H */ |