diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/soc/codecs/wm9705.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/soc/codecs/wm9705.h')
| -rw-r--r-- | sound/soc/codecs/wm9705.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm9705.h b/sound/soc/codecs/wm9705.h index d380f110f9e2..23ea9ce47359 100644 --- a/sound/soc/codecs/wm9705.h +++ b/sound/soc/codecs/wm9705.h | |||
| @@ -8,7 +8,4 @@ | |||
| 8 | #define WM9705_DAI_AC97_HIFI 0 | 8 | #define WM9705_DAI_AC97_HIFI 0 |
| 9 | #define WM9705_DAI_AC97_AUX 1 | 9 | #define WM9705_DAI_AC97_AUX 1 |
| 10 | 10 | ||
| 11 | extern struct snd_soc_dai wm9705_dai[2]; | ||
| 12 | extern struct snd_soc_codec_device soc_codec_dev_wm9705; | ||
| 13 | |||
| 14 | #endif | 11 | #endif |