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/ak4671.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/ak4671.h')
| -rw-r--r-- | sound/soc/codecs/ak4671.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/ak4671.h b/sound/soc/codecs/ak4671.h index e2fad964e88b..61cb7ab7552c 100644 --- a/sound/soc/codecs/ak4671.h +++ b/sound/soc/codecs/ak4671.h | |||
| @@ -150,7 +150,4 @@ | |||
| 150 | /* AK4671_LOUT2_POWER_MANAGEMENT (0x10) Fields */ | 150 | /* AK4671_LOUT2_POWER_MANAGEMENT (0x10) Fields */ |
| 151 | #define AK4671_MUTEN 0x04 | 151 | #define AK4671_MUTEN 0x04 |
| 152 | 152 | ||
| 153 | extern struct snd_soc_dai ak4671_dai; | ||
| 154 | extern struct snd_soc_codec_device soc_codec_dev_ak4671; | ||
| 155 | |||
| 156 | #endif | 153 | #endif |