diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 17:21:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 17:21:34 +0100 |
| commit | 8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (patch) | |
| tree | 48716af89f175c89a9be2247f77e13099980e43f /arch/arm/plat-omap/include/mach/hardware.h | |
| parent | 5a07055a3849574f4fbe5d0ce7cd2d26ab9a37c1 (diff) | |
| parent | 2e7509e5b3acc4b8653faa1966e5ac234d36ac82 (diff) | |
Merge branch 'omap2-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/plat-omap/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/hardware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h index abb01e471c4..29c849f5f18 100644 --- a/arch/arm/plat-omap/include/mach/hardware.h +++ b/arch/arm/plat-omap/include/mach/hardware.h @@ -282,8 +282,8 @@ #include "omap730.h" #include "omap1510.h" -#include "omap24xx.h" #include "omap16xx.h" +#include "omap24xx.h" #include "omap34xx.h" #ifndef __ASSEMBLER__ |