diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /include/linux/patchkey.h | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' 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 */ |