Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc

[pandora-kernel.git] / sound / soc / codecs / wm9712.c

diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index f8f37ae..d2f224d 100644 (file)
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -524,7 +524,7 @@ static struct snd_soc_dai_ops wm9712_dai_ops_aux = {
        .prepare        = ac97_aux_prepare,
 };
 
-struct snd_soc_dai_driver wm9712_dai[] = {
+static struct snd_soc_dai_driver wm9712_dai[] = {
 {
        .name = "wm9712-hifi",
        .ac97_control = 1,
@@ -674,7 +674,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9712 = {
        .read = ac97_read,
        .write = ac97_write,
        .set_bias_level = wm9712_set_bias_level,
-       .reg_cache_size = sizeof(wm9712_reg),
+       .reg_cache_size = ARRAY_SIZE(wm9712_reg),
        .reg_word_size = sizeof(u16),
        .reg_cache_step = 2,
        .reg_cache_default = wm9712_reg,