diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 01:40:31 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 01:40:31 -0500 |
| commit | b5c00a3a412857d6f07970984068c450429e051c (patch) | |
| tree | 1fde50630cbc24e11a45169f717f281db8eb6dcc /arch/arm/mach-omap2/omap_hwmod_2430.h | |
| parent | ca6f2d7fafd2d48b2f6943f5c6787beaec2014d0 (diff) | |
| parent | 3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_2430.h')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2430.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430.h b/arch/arm/mach-omap2/omap_hwmod_2430.h index a412be6420ec..59a208bea6c2 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430.h +++ b/arch/arm/mach-omap2/omap_hwmod_2430.h | |||
| @@ -16,10 +16,10 @@ | |||
| 16 | 16 | ||
| 17 | #ifdef CONFIG_ARCH_OMAP2430 | 17 | #ifdef CONFIG_ARCH_OMAP2430 |
| 18 | 18 | ||
| 19 | #include <mach/omap_hwmod.h> | 19 | #include <plat/omap_hwmod.h> |
| 20 | #include <mach/irqs.h> | 20 | #include <mach/irqs.h> |
| 21 | #include <mach/cpu.h> | 21 | #include <plat/cpu.h> |
| 22 | #include <mach/dma.h> | 22 | #include <plat/dma.h> |
| 23 | 23 | ||
| 24 | #include "prm-regbits-24xx.h" | 24 | #include "prm-regbits-24xx.h" |
| 25 | 25 | ||