summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8974.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-09-18 16:09:44 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-09-18 16:09:44 +0200
commit9f072b7b2260a588bfb5fb43418c3358104e7c13 (patch)
tree055f1082093bb63a34c7bfe43c845567685d4675 /sound/soc/codecs/wm8974.c
parentASoC: Return correct codec clock in s3c64xx-i2s (diff)
parentASoC: DaVinci: Fixes to McASP configuration (diff)
downloadlinux-9f072b7b2260a588bfb5fb43418c3358104e7c13.tar.xz
linux-9f072b7b2260a588bfb5fb43418c3358104e7c13.zip
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/codecs/wm8974.c')
-rw-r--r--sound/soc/codecs/wm8974.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index fa4d85bd048b..93d66e30f109 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>