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/wm8731.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/wm8731.h')
| -rw-r--r-- | sound/soc/codecs/wm8731.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8731.h b/sound/soc/codecs/wm8731.h index cd7b806e8ad0..e9c0c76ab73b 100644 --- a/sound/soc/codecs/wm8731.h +++ b/sound/soc/codecs/wm8731.h | |||
| @@ -31,10 +31,9 @@ | |||
| 31 | 31 | ||
| 32 | #define WM8731_CACHEREGNUM 10 | 32 | #define WM8731_CACHEREGNUM 10 |
| 33 | 33 | ||
| 34 | #define WM8731_SYSCLK 0 | 34 | #define WM8731_SYSCLK_XTAL 1 |
| 35 | #define WM8731_DAI 0 | 35 | #define WM8731_SYSCLK_MCLK 2 |
| 36 | 36 | ||
| 37 | extern struct snd_soc_dai wm8731_dai; | 37 | #define WM8731_DAI 0 |
| 38 | extern struct snd_soc_codec_device soc_codec_dev_wm8731; | ||
| 39 | 38 | ||
| 40 | #endif | 39 | #endif |