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/wm2000.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/wm2000.h')
| -rw-r--r-- | sound/soc/codecs/wm2000.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm2000.h b/sound/soc/codecs/wm2000.h index c18e261c3c7f..0b6f056f73cc 100644 --- a/sound/soc/codecs/wm2000.h +++ b/sound/soc/codecs/wm2000.h | |||
| @@ -16,9 +16,6 @@ struct wm2000_setup_data { | |||
| 16 | 16 | ||
| 17 | extern int wm2000_add_controls(struct snd_soc_codec *codec); | 17 | extern int wm2000_add_controls(struct snd_soc_codec *codec); |
| 18 | 18 | ||
| 19 | extern struct snd_soc_dai wm2000_dai; | ||
| 20 | extern struct snd_soc_codec_device soc_codec_dev_wm2000; | ||
| 21 | |||
| 22 | #define WM2000_REG_SYS_START 0x8000 | 19 | #define WM2000_REG_SYS_START 0x8000 |
| 23 | #define WM2000_REG_SPEECH_CLARITY 0x8fef | 20 | #define WM2000_REG_SPEECH_CLARITY 0x8fef |
| 24 | #define WM2000_REG_SYS_WATCHDOG 0x8ff6 | 21 | #define WM2000_REG_SYS_WATCHDOG 0x8ff6 |