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/wm9081.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/wm9081.h')
| -rw-r--r-- | sound/soc/codecs/wm9081.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm9081.h b/sound/soc/codecs/wm9081.h index 42d3bc757021..871cccb066dc 100644 --- a/sound/soc/codecs/wm9081.h +++ b/sound/soc/codecs/wm9081.h | |||
| @@ -15,9 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | #include <sound/soc.h> | 16 | #include <sound/soc.h> |
| 17 | 17 | ||
| 18 | extern struct snd_soc_dai wm9081_dai; | ||
| 19 | extern struct snd_soc_codec_device soc_codec_dev_wm9081; | ||
| 20 | |||
| 21 | /* | 18 | /* |
| 22 | * SYSCLK sources | 19 | * SYSCLK sources |
| 23 | */ | 20 | */ |