diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
| commit | 8e49fbd70c5888996be433512ab44666af708a23 (patch) | |
| tree | f7ee567bd8e35a785992c18c80883b5b6570b3d4 /sound/soc/codecs/wm8960.h | |
| parent | a07527daf4b80514fb8b898f073c843187e47f80 (diff) | |
| parent | 135e44aaa47c22b66c8d2acb54da1106a6c17598 (diff) | |
Merge remote branch 'sound-asoc/for-next'
Conflicts:
drivers/video/sh_mobile_hdmi.c
Diffstat (limited to 'sound/soc/codecs/wm8960.h')
| -rw-r--r-- | sound/soc/codecs/wm8960.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8960.h b/sound/soc/codecs/wm8960.h index a5ef65481b86..2d8163d7004b 100644 --- a/sound/soc/codecs/wm8960.h +++ b/sound/soc/codecs/wm8960.h @@ -110,7 +110,4 @@ #define WM8960_OPCLK_DIV_5_5 (4 << 0) #define WM8960_OPCLK_DIV_6 (5 << 0) -extern struct snd_soc_dai wm8960_dai; -extern struct snd_soc_codec_device soc_codec_dev_wm8960; - #endif |