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/wm8904.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/wm8904.h')
| -rw-r--r-- | sound/soc/codecs/wm8904.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8904.h b/sound/soc/codecs/wm8904.h index abe5059b3004..9e8c84188ba7 100644 --- a/sound/soc/codecs/wm8904.h +++ b/sound/soc/codecs/wm8904.h | |||
| @@ -21,9 +21,6 @@ | |||
| 21 | #define WM8904_FLL_LRCLK 3 | 21 | #define WM8904_FLL_LRCLK 3 |
| 22 | #define WM8904_FLL_FREE_RUNNING 4 | 22 | #define WM8904_FLL_FREE_RUNNING 4 |
| 23 | 23 | ||
| 24 | extern struct snd_soc_dai wm8904_dai; | ||
| 25 | extern struct snd_soc_codec_device soc_codec_dev_wm8904; | ||
| 26 | |||
| 27 | /* | 24 | /* |
| 28 | * Register values. | 25 | * Register values. |
| 29 | */ | 26 | */ |