diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 19:08:43 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 19:08:43 +0100 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /arch/arm/plat-omap/mcbsp.c | |
| parent | Linux 2.6.32-rc8 (diff) | |
| parent | Merge branch 'pm-upstream/pm-cpuidle' of ssh://master.kernel.org/pub/scm/linu... (diff) | |
| download | linux-a76df42a675c9936e8bf3607226e74c8a5e2d847.tar.xz linux-a76df42a675c9936e8bf3607226e74c8a5e2d847.zip | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
| -rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index e664b912d7bb..92770334d728 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -24,8 +24,8 @@ #include <linux/delay.h> #include <linux/io.h> -#include <mach/dma.h> -#include <mach/mcbsp.h> +#include <plat/dma.h> +#include <plat/mcbsp.h> struct omap_mcbsp **mcbsp_ptr; int omap_mcbsp_count; |