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/wm8974.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/wm8974.h')
| -rw-r--r-- | sound/soc/codecs/wm8974.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8974.h b/sound/soc/codecs/wm8974.h index 896a7f0f3fc4..3c94e7bb55a6 100644 --- a/sound/soc/codecs/wm8974.h +++ b/sound/soc/codecs/wm8974.h | |||
| @@ -83,7 +83,4 @@ | |||
| 83 | #define WM8974_MCLKDIV_8 (6 << 5) | 83 | #define WM8974_MCLKDIV_8 (6 << 5) |
| 84 | #define WM8974_MCLKDIV_12 (7 << 5) | 84 | #define WM8974_MCLKDIV_12 (7 << 5) |
| 85 | 85 | ||
| 86 | extern struct snd_soc_dai wm8974_dai; | ||
| 87 | extern struct snd_soc_codec_device soc_codec_dev_wm8974; | ||
| 88 | |||
| 89 | #endif | 86 | #endif |