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/tlv320aic23.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/tlv320aic23.h')
| -rw-r--r-- | sound/soc/codecs/tlv320aic23.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/tlv320aic23.h b/sound/soc/codecs/tlv320aic23.h index 79d1faf8e570..e804120bd3da 100644 --- a/sound/soc/codecs/tlv320aic23.h +++ b/sound/soc/codecs/tlv320aic23.h | |||
| @@ -116,7 +116,4 @@ | |||
| 116 | #define TLV320AIC23_SIDETONE_12 0x080 | 116 | #define TLV320AIC23_SIDETONE_12 0x080 |
| 117 | #define TLV320AIC23_SIDETONE_18 0x0c0 | 117 | #define TLV320AIC23_SIDETONE_18 0x0c0 |
| 118 | 118 | ||
| 119 | extern struct snd_soc_dai tlv320aic23_dai; | ||
| 120 | extern struct snd_soc_codec_device soc_codec_dev_tlv320aic23; | ||
| 121 | |||
| 122 | #endif /* _TLV320AIC23_H */ | 119 | #endif /* _TLV320AIC23_H */ |