summaryrefslogtreecommitdiffstats
path: root/include/linux/awe_voice.h
diff options
context:
space:
mode:
authorStuart Brady <sdbrady@ntlworld.com>2005-05-05 16:15:07 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 16:36:31 -0700
commit60d300c02fe2e0be9bb02904361e41e0307264b2 (patch)
tree28734e32dd7b7deea4d9d1456b354f59de2f2187 /include/linux/awe_voice.h
parent42d77c70177b2f7535766bce938d965fd863f0fd (diff)
[PATCH] include/linux/soundcard.h: endianness fix
Fixes for big-endian systems in soundcard.h and awe_voice.h This patch fixes the AFMT_S16_NE (include/linux/soundcard.h) and AWE_PATCH (awe_voice.h) macros on big-endian systems. It also moves _PATCHKEY into a new file, patchkey.h, in order to remove a duplicate definition of it from awe_voice.h. Signed-off-by: Stuart Brady <sdbrady@ntlworld.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/awe_voice.h')
-rw-r--r--include/linux/awe_voice.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/awe_voice.h b/include/linux/awe_voice.h
index da0e27de752..4bf9f33048e 100644
--- a/include/linux/awe_voice.h
+++ b/include/linux/awe_voice.h
@@ -29,9 +29,9 @@
#define SAMPLE_TYPE_AWE32 0x20
#endif
-#ifndef _PATCHKEY
-#define _PATCHKEY(id) ((id<<8)|0xfd)
-#endif
+#define _LINUX_PATCHKEY_H_INDIRECT
+#include <linux/patchkey.h>
+#undef _LINUX_PATCHKEY_H_INDIRECT
/*----------------------------------------------------------------
* patch information record