diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 10:09:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 10:09:44 -0400 |
| commit | 9f072b7b2260a588bfb5fb43418c3358104e7c13 (patch) | |
| tree | 055f1082093bb63a34c7bfe43c845567685d4675 /sound/soc/codecs/wm8974.c | |
| parent | b1cd6b9ec7c749ddfad628c8c12659591ae195e6 (diff) | |
| parent | 0c31cf3e4af79ea18bbd365b07ef0de207673894 (diff) | |
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.c | 1 |
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 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/moduleparam.h> | 14 | #include <linux/moduleparam.h> |
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |