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/wm8993.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/wm8993.h')
| -rw-r--r-- | sound/soc/codecs/wm8993.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8993.h b/sound/soc/codecs/wm8993.h index 30e71ca88dad..2184617b9611 100644 --- a/sound/soc/codecs/wm8993.h +++ b/sound/soc/codecs/wm8993.h | |||
| @@ -1,9 +1,6 @@ | |||
| 1 | #ifndef WM8993_H | 1 | #ifndef WM8993_H |
| 2 | #define WM8993_H | 2 | #define WM8993_H |
| 3 | 3 | ||
| 4 | extern struct snd_soc_dai wm8993_dai; | ||
| 5 | extern struct snd_soc_codec_device soc_codec_dev_wm8993; | ||
| 6 | |||
| 7 | #define WM8993_SYSCLK_MCLK 1 | 4 | #define WM8993_SYSCLK_MCLK 1 |
| 8 | #define WM8993_SYSCLK_FLL 2 | 5 | #define WM8993_SYSCLK_FLL 2 |
| 9 | 6 | ||