Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[karo-tx-linux.git] / include / sound / ad1848.h

diff --git a/include/sound/ad1848.h b/include/sound/ad1848.h
index c8de6f83338f675efec508eecf7a56e3385d7a36..d04f9e78c7c130f3732cb7546efa0f617c296853 100644 (file)
--- a/include/sound/ad1848.h
+++ b/include/sound/ad1848.h
@@ -2,7 +2,7 @@
 #define __SOUND_AD1848_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Definitions for AD1847/AD1848/CS4248 chips
  *
  *
@@ -27,7 +27,7 @@
 
 /* IO ports */
 
-#define AD1848P( codec, x ) ( (chip) -> port + c_d_c_AD1848##x )
+#define AD1848P( chip, x ) ( (chip) -> port + c_d_c_AD1848##x )
 
 #define c_d_c_AD1848REGSEL     0
 #define c_d_c_AD1848REG                1
@@ -154,7 +154,6 @@ struct snd_ad1848 {
 #endif
 
        spinlock_t reg_lock;
-       struct mutex open_mutex;
 };
 
 /* exported functions */
@@ -185,7 +184,7 @@ struct ad1848_mix_elem {
        int index;
        int type;
        unsigned long private_value;
-       unsigned int *tlv;
+       const unsigned int *tlv;
 };
 
 #define AD1848_SINGLE(xname, xindex, reg, shift, mask, invert) \