diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /include/linux/patchkey.h | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
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 */ |