diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 21:00:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 21:00:04 +0100 |
| commit | e6ab07ce0f0cb1636fd14aa4f3e6e9631bd5d0c6 (patch) | |
| tree | c9059671b19c1cf7f18e52f15f8a4dd379e25887 /sound | |
| parent | cc780d380a004b58c139570b037d0e3b897bb2be (diff) | |
| parent | 923a00427a141a6d1c83f1b151221a2458b2de8d (diff) | |
| download | blackbird-op-linux-e6ab07ce0f0cb1636fd14aa4f3e6e9631bd5d0c6.tar.gz blackbird-op-linux-e6ab07ce0f0cb1636fd14aa4f3e6e9631bd5d0c6.zip | |
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')
| -rw-r--r-- | sound/soc/codecs/ad193x.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/cq93vc.c | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | sound/soc/codecs/twl6040.c | 1 | ||||
| -rw-r--r-- | sound/soc/davinci/davinci-vcif.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index d034464e26ff..e10820670752 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -12,6 +12,7 @@ #include <linux/device.h> #include <linux/i2c.h> #include <linux/spi/spi.h> +#include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 513297441369..8f19b9310645 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -27,6 +27,7 @@ #include <linux/pm.h> #include <linux/platform_device.h> #include <linux/device.h> +#include <linux/slab.h> #include <linux/clk.h> #include <linux/mfd/davinci_voicecodec.h> diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 0e4dce7de052..108c51a513c8 100755..100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -27,6 +27,7 @@ #include <linux/i2c.h> #include <linux/gpio.h> #include <linux/platform_device.h> +#include <linux/slab.h> #include <linux/i2c/twl.h> #include <sound/core.h> 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 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/delay.h> +#include <linux/slab.h> #include <linux/io.h> #include <linux/mfd/davinci_voicecodec.h> |
