From 1d3d06169f98d2c1fed45d1c935a8038e2795902 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 13 Dec 2011 15:07:49 +0000
Subject: [PATCH] --- yaml --- r: 285013 b: refs/heads/master c:
 fdc29805bd7cae133303045fc0249d76f3827613 h: refs/heads/master i:   285011:
 2d0d12aff99cc4a007a4c756cd30730a5dd6c01b v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/soundcard.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3b5d47f8bc88..fc0c7d150c0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 989e986f5b1748fe3ff714954dc0d23780c43a9c
+refs/heads/master: fdc29805bd7cae133303045fc0249d76f3827613
diff --git a/trunk/include/linux/soundcard.h b/trunk/include/linux/soundcard.h
index fe204fe39f7c..dfcf86f013a9 100644
--- a/trunk/include/linux/soundcard.h
+++ b/trunk/include/linux/soundcard.h
@@ -198,7 +198,8 @@ typedef struct seq_event_rec {
 #  else
 #    error "could not determine byte order"
 #  endif
-#elif defined(__BYTE_ORDER)
+#else
+# if defined(__BYTE_ORDER)
 #  if __BYTE_ORDER == __BIG_ENDIAN
 #    define AFMT_S16_NE AFMT_S16_BE
 #  elif __BYTE_ORDER == __LITTLE_ENDIAN
@@ -206,6 +207,7 @@ typedef struct seq_event_rec {
 #  else
 #    error "could not determine byte order"
 #  endif
+# endif
 #endif
 
 /*