diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 16:00:04 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 16:00:04 -0400 |
| commit | e6ab07ce0f0cb1636fd14aa4f3e6e9631bd5d0c6 (patch) | |
| tree | c9059671b19c1cf7f18e52f15f8a4dd379e25887 /sound/soc/davinci/davinci-vcif.c | |
| parent | cc780d380a004b58c139570b037d0e3b897bb2be (diff) | |
| parent | 923a00427a141a6d1c83f1b151221a2458b2de8d (diff) | |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.35
Diffstat (limited to 'sound/soc/davinci/davinci-vcif.c')
| -rw-r--r-- | sound/soc/davinci/davinci-vcif.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index 54b91e1768c4..9aa980d38231 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/device.h> | 25 | #include <linux/device.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
| 28 | #include <linux/mfd/davinci_voicecodec.h> | 29 | #include <linux/mfd/davinci_voicecodec.h> |
| 29 | 30 | ||