diff options
author | Mark Brown | 2010-04-17 03:45:54 +0200 |
---|---|---|
committer | Mark Brown | 2010-04-17 03:45:54 +0200 |
commit | 890c681275ab02623de1187f2d97fc355d76f372 (patch) | |
tree | 9098c63135cfa468a787a9ae25fba0d4b15f4f91 /sound/soc/codecs | |
parent | ASoC: Zipit Z2 WM8750 ASoC driver (diff) | |
parent | ASoC: imx-ssi: do not call hrtimer_disable in trigger function (diff) | |
download | kernel-qcow2-linux-890c681275ab02623de1187f2d97fc355d76f372.tar.gz kernel-qcow2-linux-890c681275ab02623de1187f2d97fc355d76f372.tar.xz kernel-qcow2-linux-890c681275ab02623de1187f2d97fc355d76f372.zip |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/wm2000.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 217b02680597..8de866618bf4 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> |