diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /sound/soc/codecs/stac9766.c | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
Diffstat (limited to 'sound/soc/codecs/stac9766.c')
| -rw-r--r-- | sound/soc/codecs/stac9766.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index 00d67cc8e206..061f9e5a497b 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c | |||
| @@ -383,6 +383,7 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = { | |||
| 383 | .reg_cache_size = sizeof(stac9766_reg), | 383 | .reg_cache_size = sizeof(stac9766_reg), |
| 384 | .reg_word_size = sizeof(u16), | 384 | .reg_word_size = sizeof(u16), |
| 385 | .reg_cache_step = 2, | 385 | .reg_cache_step = 2, |
| 386 | .reg_cache_default = stac9766_reg, | ||
| 386 | }; | 387 | }; |
| 387 | 388 | ||
| 388 | static __devinit int stac9766_probe(struct platform_device *pdev) | 389 | static __devinit int stac9766_probe(struct platform_device *pdev) |