diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 13:21:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 13:21:52 -0700 |
| commit | b938fb6f491113880ebaabfa06c6446723c702fd (patch) | |
| tree | d19c6487b64b4002b31446160f2670394ab4ef1b /sound/soc/codecs/wm8974.c | |
| parent | de55a8958f6e3ef5ce5f0971b80bd44bfcac7cf1 (diff) | |
| parent | 87bfa1dbfb22aab2bb6c1085c1fe7d56cdd2f044 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Fix MSI GX620 mixer
ASoC: remove unused #include <linux/version.h>
ASoC: S3C lrsync function made to work with IRQs disabled.
ALSA: hda - Fix Dell S14 pin setup
ALSA: hda - Fix IDT92HD83* codec setup
ASoC: Fix display of stream name in DAPM debugfs
ALSA: hda - Add support for HP dv6
ALSA: hda - Fix HP/line-out initialization with IDT/STAC codecs
ALSA: hda - Set default GPIO for IDT92HD71bxx
ALSA: hda - Set default GPIO for STAC/IDT codecs
ASoC: Clean up error handling in MPC5200 DMA setup
ALSA: hda - Add missing model=auto entry for ALC269
Diffstat (limited to 'sound/soc/codecs/wm8974.c')
| -rw-r--r-- | sound/soc/codecs/wm8974.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index d8a013ab3177..98d663afc97d 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -12,7 +12,6 @@ #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/delay.h> |