summaryrefslogtreecommitdiff
path: root/include/linux/patchkey.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-20 12:10:09 +0100
committerTakashi Iwai <tiwai@suse.de>2012-01-20 12:10:09 +0100
commiteefad7fd53eae2eb8d1e205b1d3a18f67e4e6b46 (patch)
tree497ef1a21d90c63ac2e4ca6389c0844d0d72b0a8 /include/linux/patchkey.h
parentb9ecc4ee28a5ff5b3997da247cd9df1320c602a9 (diff)
parentac9ef6cf9196107115930e9fc66207199ef395b3 (diff)
Merge branch 'topic/convert-bint' into topic/hda
Merge the conversions to bint module option type.
Diffstat (limited to 'include/linux/patchkey.h')
-rw-r--r--include/linux/patchkey.h4
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 @@
# else
# error "could not determine byte order"
# endif
-#elif defined(__BYTE_ORDER)
+#else
+#if defined(__BYTE_ORDER)
# if __BYTE_ORDER == __BIG_ENDIAN
# define _PATCHKEY(id) (0xfd00|id)
# elif __BYTE_ORDER == __LITTLE_ENDIAN
@@ -41,5 +42,6 @@
# error "could not determine byte order"
# endif
#endif
+#endif
#endif /* _LINUX_PATCHKEY_H */