diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-15 15:45:31 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-15 15:45:31 +0100 |
commit | 49a93bc978b4b3d564f6b330179b4cc2724a031d (patch) | |
tree | 8b14b6c1d32b2a64bd9e7d0793717780ecc1d985 /include/sound/soc-dapm.h | |
parent | x86: fix broken flush_tlb_others_ipi(), fix (diff) | |
parent | Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
download | linux-49a93bc978b4b3d564f6b330179b4cc2724a031d.tar.xz linux-49a93bc978b4b3d564f6b330179b4cc2724a031d.zip |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r-- | include/sound/soc-dapm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 4af1083e3287..93a4edb148b5 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -178,7 +178,7 @@ .private_value = (unsigned long)&xenum } #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ - .info = snd_soc_info_value_enum_double, \ + .info = snd_soc_info_enum_double, \ .get = snd_soc_dapm_get_value_enum_double, \ .put = snd_soc_dapm_put_value_enum_double, \ .private_value = (unsigned long)&xenum } |