diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
| commit | 27b92d4ff2be2359a21ff4acde5b63563ff720e2 (patch) | |
| tree | 49691b22fe1318aa68d5ebdff74795f004f0cf8f /sound/soc/codecs/wm8804.c | |
| parent | 5de0ee574be8f6922a6c33f2fbc7e9b130a2f626 (diff) | |
| parent | e58a8947b0264ec1f43ce5deef563b72acf1284f (diff) | |
| download | kernel_samsung_tuna-27b92d4ff2be2359a21ff4acde5b63563ff720e2.zip kernel_samsung_tuna-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.gz kernel_samsung_tuna-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.bz2 | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8804.c')
| -rw-r--r-- | sound/soc/codecs/wm8804.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 6dae1b4..6785688 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -175,7 +175,7 @@ static int txsrc_put(struct snd_kcontrol *kcontrol, return 0; } -static int wm8804_volatile(unsigned int reg) +static int wm8804_volatile(struct snd_soc_codec *codec, unsigned int reg) { switch (reg) { case WM8804_RST_DEVID1: |