summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-05-21 22:10:21 +0100
committerBen Dooks <ben-linux@fluff.org>2009-05-21 22:10:21 +0100
commit99ae99533a059750c4b0f76295625b8ac5ea751a (patch)
tree281129684e730ccd5b5b1e1fbbd9b83f3fa18986 /sound
parentbcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0 (diff)
parent7a05a2cbd317cbd16e6d1689bb1e5e208eaaba6f (diff)
downloadop-kernel-dev-99ae99533a059750c4b0f76295625b8ac5ea751a.zip
op-kernel-dev-99ae99533a059750c4b0f76295625b8ac5ea751a.tar.gz
[ARM] S3C24XX: Merge devel-gpio
Merge branch 'devel-gpio' into for-rmk-devel
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/s3c24xx/s3c2412-i2s.c1
-rw-r--r--sound/soc/s3c24xx/s3c2443-ac97.c1
-rw-r--r--sound/soc/s3c24xx/s3c24xx-i2s.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c
index b7e0b3f..c35b74b 100644
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/sound/soc/s3c24xx/s3c2412-i2s.c
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/device.h>
#include <linux/delay.h>
+#include <linux/gpio.h>
#include <linux/clk.h>
#include <linux/kernel.h>
#include <linux/io.h>
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 3698f70..3f03d5d 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -19,6 +19,7 @@
#include <linux/io.h>
#include <linux/wait.h>
#include <linux/delay.h>
+#include <linux/gpio.h>
#include <linux/clk.h>
#include <sound/core.h>
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
index cc06696..556e35f 100644
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -21,6 +21,8 @@
#include <linux/clk.h>
#include <linux/jiffies.h>
#include <linux/io.h>
+#include <linux/gpio.h>
+
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
OpenPOWER on IntegriCloud