diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
| commit | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (patch) | |
| tree | 0114637e8be2b38176e7e91e6cea3501b22cb66a /sound/soc/codecs/tlv320aic26.h | |
| parent | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (diff) | |
| parent | b11bdb5254ff17cb63e4ae5088b73fdcd2cc2602 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
Diffstat (limited to 'sound/soc/codecs/tlv320aic26.h')
| -rw-r--r-- | sound/soc/codecs/tlv320aic26.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/tlv320aic26.h b/sound/soc/codecs/tlv320aic26.h index 786ba16c945f..62b1f2261429 100644 --- a/sound/soc/codecs/tlv320aic26.h +++ b/sound/soc/codecs/tlv320aic26.h | |||
| @@ -90,7 +90,4 @@ enum aic26_wlen { | |||
| 90 | AIC26_WLEN_32 = 3 << 10, | 90 | AIC26_WLEN_32 = 3 << 10, |
| 91 | }; | 91 | }; |
| 92 | 92 | ||
| 93 | extern struct snd_soc_dai aic26_dai; | ||
| 94 | extern struct snd_soc_codec_device aic26_soc_codec_dev; | ||
| 95 | |||
| 96 | #endif /* _TLV320AIC16_H_ */ | 93 | #endif /* _TLV320AIC16_H_ */ |