diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-22 10:08:43 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 10:08:43 -0800 |
commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
tree | 96d93706d884dea956393653452fa4d78d8d7f76 /arch/arm/mach-omap2/omap_hwmod_2420.h | |
parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
download | blackbird-op-linux-a76df42a675c9936e8bf3607226e74c8a5e2d847.tar.gz blackbird-op-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/mach-omap2/omap_hwmod_2420.h')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2420.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420.h b/arch/arm/mach-omap2/omap_hwmod_2420.h index 767e4965ac4e..a9ca1b99a301 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420.h +++ b/arch/arm/mach-omap2/omap_hwmod_2420.h @@ -16,10 +16,10 @@ #ifdef CONFIG_ARCH_OMAP2420 -#include <mach/omap_hwmod.h> +#include <plat/omap_hwmod.h> #include <mach/irqs.h> -#include <mach/cpu.h> -#include <mach/dma.h> +#include <plat/cpu.h> +#include <plat/dma.h> #include "prm-regbits-24xx.h" |