summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm2000.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-16 10:03:36 +0200
committerTakashi Iwai <tiwai@suse.de>2010-04-16 10:03:36 +0200
commitd336905e00f208bcb89c719022c11dd3d976597a (patch)
tree6a5e3cf552231abe24df3cfae8f5d3884c7a1b4f /sound/soc/codecs/wm2000.c
parentLinux 2.6.34-rc4 (diff)
parentASoC: imx-ssi: do not call hrtimer_disable in trigger function (diff)
downloadlinux-d336905e00f208bcb89c719022c11dd3d976597a.tar.xz
linux-d336905e00f208bcb89c719022c11dd3d976597a.zip
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm2000.c')
-rw-r--r--sound/soc/codecs/wm2000.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index a34cbcf7904f..002e289d1255 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/firmware.h>