diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /sound | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 4 | ||||
| -rw-r--r-- | sound/soc/omap/n810.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 6 | ||||
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap2evm.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap3beagle.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap3evm.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/osk5912.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/overo.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/sdp3430.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/zoom2.c | 2 |
11 files changed, 14 insertions, 14 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 5a5166ac7279..3f1a6c1a0355 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c | |||
| @@ -31,8 +31,8 @@ | |||
| 31 | 31 | ||
| 32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| 33 | 33 | ||
| 34 | #include <mach/board-ams-delta.h> | 34 | #include <plat/board-ams-delta.h> |
| 35 | #include <mach/mcbsp.h> | 35 | #include <plat/mcbsp.h> |
| 36 | 36 | ||
| 37 | #include "omap-mcbsp.h" | 37 | #include "omap-mcbsp.h" |
| 38 | #include "omap-pcm.h" | 38 | #include "omap-pcm.h" |
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 0a505938e42b..08e09d72790f 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| 33 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
| 34 | #include <linux/gpio.h> | 34 | #include <linux/gpio.h> |
| 35 | #include <mach/mcbsp.h> | 35 | #include <plat/mcbsp.h> |
| 36 | 36 | ||
| 37 | #include "omap-mcbsp.h" | 37 | #include "omap-mcbsp.h" |
| 38 | #include "omap-pcm.h" | 38 | #include "omap-pcm.h" |
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 3341f49402ca..e8e63ba40877 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
| @@ -31,9 +31,9 @@ | |||
| 31 | #include <sound/initval.h> | 31 | #include <sound/initval.h> |
| 32 | #include <sound/soc.h> | 32 | #include <sound/soc.h> |
| 33 | 33 | ||
| 34 | #include <mach/control.h> | 34 | #include <plat/control.h> |
| 35 | #include <mach/dma.h> | 35 | #include <plat/dma.h> |
| 36 | #include <mach/mcbsp.h> | 36 | #include <plat/mcbsp.h> |
| 37 | #include "omap-mcbsp.h" | 37 | #include "omap-mcbsp.h" |
| 38 | #include "omap-pcm.h" | 38 | #include "omap-pcm.h" |
| 39 | 39 | ||
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 5735945788bf..1169d2ec2e24 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <sound/pcm_params.h> | 28 | #include <sound/pcm_params.h> |
| 29 | #include <sound/soc.h> | 29 | #include <sound/soc.h> |
| 30 | 30 | ||
| 31 | #include <mach/dma.h> | 31 | #include <plat/dma.h> |
| 32 | #include "omap-pcm.h" | 32 | #include "omap-pcm.h" |
| 33 | 33 | ||
| 34 | static const struct snd_pcm_hardware omap_pcm_hardware = { | 34 | static const struct snd_pcm_hardware omap_pcm_hardware = { |
diff --git a/sound/soc/omap/omap2evm.c b/sound/soc/omap/omap2evm.c index 027e1a40f8a1..c7adea38274c 100644 --- a/sound/soc/omap/omap2evm.c +++ b/sound/soc/omap/omap2evm.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
| 32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
| 33 | #include <mach/gpio.h> | 33 | #include <mach/gpio.h> |
| 34 | #include <mach/mcbsp.h> | 34 | #include <plat/mcbsp.h> |
| 35 | 35 | ||
| 36 | #include "omap-mcbsp.h" | 36 | #include "omap-mcbsp.h" |
| 37 | #include "omap-pcm.h" | 37 | #include "omap-pcm.h" |
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c index b0cff9f33b7e..d88ad5ca526c 100644 --- a/sound/soc/omap/omap3beagle.c +++ b/sound/soc/omap/omap3beagle.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
| 30 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 31 | #include <mach/gpio.h> | 31 | #include <mach/gpio.h> |
| 32 | #include <mach/mcbsp.h> | 32 | #include <plat/mcbsp.h> |
| 33 | 33 | ||
| 34 | #include "omap-mcbsp.h" | 34 | #include "omap-mcbsp.h" |
| 35 | #include "omap-pcm.h" | 35 | #include "omap-pcm.h" |
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c index 9114c263077b..41a91b5cf12b 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
| 28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
| 29 | #include <mach/gpio.h> | 29 | #include <mach/gpio.h> |
| 30 | #include <mach/mcbsp.h> | 30 | #include <plat/mcbsp.h> |
| 31 | 31 | ||
| 32 | #include "omap-mcbsp.h" | 32 | #include "omap-mcbsp.h" |
| 33 | #include "omap-pcm.h" | 33 | #include "omap-pcm.h" |
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index a4e149b7f0eb..498ca2e03519 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
| 32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
| 33 | #include <linux/gpio.h> | 33 | #include <linux/gpio.h> |
| 34 | #include <mach/mcbsp.h> | 34 | #include <plat/mcbsp.h> |
| 35 | 35 | ||
| 36 | #include "omap-mcbsp.h" | 36 | #include "omap-mcbsp.h" |
| 37 | #include "omap-pcm.h" | 37 | #include "omap-pcm.h" |
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index ec4f8fd8b3a2..624f40ecc472 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
| 30 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 31 | #include <mach/gpio.h> | 31 | #include <mach/gpio.h> |
| 32 | #include <mach/mcbsp.h> | 32 | #include <plat/mcbsp.h> |
| 33 | 33 | ||
| 34 | #include "omap-mcbsp.h" | 34 | #include "omap-mcbsp.h" |
| 35 | #include "omap-pcm.h" | 35 | #include "omap-pcm.h" |
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index 4a3f62d1f295..c071f9603a38 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
| 35 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
| 36 | #include <mach/gpio.h> | 36 | #include <mach/gpio.h> |
| 37 | #include <mach/mcbsp.h> | 37 | #include <plat/mcbsp.h> |
| 38 | 38 | ||
| 39 | #include "omap-mcbsp.h" | 39 | #include "omap-mcbsp.h" |
| 40 | #include "omap-pcm.h" | 40 | #include "omap-pcm.h" |
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index f90b45f56220..f90a2ac888cf 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
| 30 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 31 | #include <mach/gpio.h> | 31 | #include <mach/gpio.h> |
| 32 | #include <mach/mcbsp.h> | 32 | #include <plat/mcbsp.h> |
| 33 | 33 | ||
| 34 | #include "omap-mcbsp.h" | 34 | #include "omap-mcbsp.h" |
| 35 | #include "omap-pcm.h" | 35 | #include "omap-pcm.h" |