diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/ux500/mop500_ab8500.c | 2 | ||||
-rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 4 | ||||
-rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.c | 4 | ||||
-rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.h | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index 78cce236693e..892ad9a05c9f 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c | |||
@@ -17,8 +17,6 @@ | |||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
19 | 19 | ||
20 | #include <mach/hardware.h> | ||
21 | |||
22 | #include <sound/soc.h> | 20 | #include <sound/soc.h> |
23 | #include <sound/soc-dapm.h> | 21 | #include <sound/soc-dapm.h> |
24 | #include <sound/pcm.h> | 22 | #include <sound/pcm.h> |
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 94a3e5705aaa..54028cf76511 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c | |||
@@ -19,9 +19,7 @@ | |||
19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
20 | #include <linux/regulator/consumer.h> | 20 | #include <linux/regulator/consumer.h> |
21 | #include <linux/mfd/dbx500-prcmu.h> | 21 | #include <linux/mfd/dbx500-prcmu.h> |
22 | 22 | #include <linux/platform_data/asoc-ux500-msp.h> | |
23 | #include <mach/hardware.h> | ||
24 | #include <mach/msp.h> | ||
25 | 23 | ||
26 | #include <sound/soc.h> | 24 | #include <sound/soc.h> |
27 | #include <sound/soc-dai.h> | 25 | #include <sound/soc-dai.h> |
diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index a26c6bf0a29b..f2db6c90a9e2 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c | |||
@@ -20,9 +20,7 @@ | |||
20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
22 | #include <linux/of.h> | 22 | #include <linux/of.h> |
23 | 23 | #include <linux/platform_data/asoc-ux500-msp.h> | |
24 | #include <mach/hardware.h> | ||
25 | #include <mach/msp.h> | ||
26 | 24 | ||
27 | #include <sound/soc.h> | 25 | #include <sound/soc.h> |
28 | 26 | ||
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 1311c0df7628..437f0c032c58 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h | |||
@@ -17,8 +17,6 @@ | |||
17 | 17 | ||
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | 19 | ||
20 | #include <mach/msp.h> | ||
21 | |||
22 | #define MSP_INPUT_FREQ_APB 48000000 | 20 | #define MSP_INPUT_FREQ_APB 48000000 |
23 | 21 | ||
24 | /*** Stereo mode. Used for APB data accesses as 16 bits accesses (mono), | 22 | /*** Stereo mode. Used for APB data accesses as 16 bits accesses (mono), |