Merge branch 'master' into upstream

[pandora-kernel.git] / include / sound / emu10k1.h

diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 975df28..23e45a4 100644 (file)
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -628,7 +628,7 @@
 #define FXWC_SPDIFLEFT          (1<<22)                /* 0x00400000 */
 #define FXWC_SPDIFRIGHT         (1<<23)                /* 0x00800000 */
 
-#define A_TBLSZ        `               0x43    /* Effects Tank Internal Table Size. Only low byte or register used */
+#define A_TBLSZ                        0x43    /* Effects Tank Internal Table Size. Only low byte or register used */
 
 #define TCBS                   0x44            /* Tank cache buffer size register                      */
 #define TCBS_MASK              0x00000007      /* Tank cache buffer size field                         */
@@ -1903,7 +1903,7 @@ struct snd_emu10k1_fx8010_control_gpr {
        unsigned int min;               /* minimum range */
        unsigned int max;               /* maximum range */
        unsigned int translation;       /* translation type (EMU10K1_GPR_TRANSLATION*) */
-       unsigned int *tlv;
+       const unsigned int *tlv;
 };
 
 /* old ABI without TLV support */