[2.6 patch] sound/oss/awe_wave.c: fix a compile warning

From: Adrian Bunk
Date: Thu Mar 03 2005 - 16:04:43 EST


This patch fixes the following compile warning:

<-- snip -->

...
CC sound/oss/awe_wave.o
In file included from sound/oss/os.h:31,
from sound/oss/sound_config.h:21,
from sound/oss/awe_wave.c:37:
include/linux/soundcard.h:195:1: warning: "_PATCHKEY" redefined
In file included from sound/oss/awe_wave.c:30:
include/linux/awe_voice.h:33:1: warning: this is the location of the previous definition
...

<-- snip -->


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.11-rc5-mm1-full/include/linux/awe_voice.h.old 2005-03-03 16:14:35.000000000 +0100
+++ linux-2.6.11-rc5-mm1-full/include/linux/awe_voice.h 2005-03-03 16:15:12.000000000 +0100
@@ -29,10 +29,6 @@
#define SAMPLE_TYPE_AWE32 0x20
#endif

-#ifndef _PATCHKEY
-#define _PATCHKEY(id) ((id<<8)|0xfd)
-#endif
-
/*----------------------------------------------------------------
* patch information record
*----------------------------------------------------------------*/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/