diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-17 10:45:54 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-17 10:45:54 +0900 |
| commit | 890c681275ab02623de1187f2d97fc355d76f372 (patch) | |
| tree | 9098c63135cfa468a787a9ae25fba0d4b15f4f91 /sound/soc/codecs | |
| parent | d21e0f4cd16656f71207683ee27465600ad21625 (diff) | |
| parent | 8392609969b3b37a4da5cff08161661f7a8c16af (diff) | |
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> |