diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-22 14:40:47 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-22 14:40:47 -0500 |
| commit | a5cf8060abef9bbc60de356088a5755b7a1f890c (patch) | |
| tree | d5fd10983ff08c42eb35f53d8b89a85715bdfcc5 /sound/soc/samsung | |
| parent | e3470da9e6f1f958737df7fe95631d20024f61b2 (diff) | |
| parent | 3d94a2a53a3979c30620e3adea10f20bef8267b3 (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/smdk_wm8994.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index f75e43997d5b..ad9ac42522e2 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include "../codecs/wm8994.h" | 10 | #include "../codecs/wm8994.h" |
| 11 | #include <sound/pcm_params.h> | 11 | #include <sound/pcm_params.h> |
| 12 | #include <linux/module.h> | ||
| 12 | 13 | ||
| 13 | /* | 14 | /* |
| 14 | * Default CFG switch settings to use this driver: | 15 | * Default CFG switch settings to use this driver: |