diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 10:03:36 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 10:03:36 +0200 |
commit | d336905e00f208bcb89c719022c11dd3d976597a (patch) | |
tree | 6a5e3cf552231abe24df3cfae8f5d3884c7a1b4f /sound/soc/codecs/wm2000.c | |
parent | Linux 2.6.34-rc4 (diff) | |
parent | ASoC: imx-ssi: do not call hrtimer_disable in trigger function (diff) | |
download | linux-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.c | 1 |
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> |