summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/mach/hardware.h
diff options
context:
space:
mode:
authorTony Lindgren2008-10-06 14:49:36 +0200
committerTony Lindgren2008-10-06 14:49:36 +0200
commit646e3ed1a349fbccce651fed2d3987f0e7b0f0f4 (patch)
treeb9c4d52027da1468e52294f3f8db3afb0720c86d /arch/arm/plat-omap/include/mach/hardware.h
parentARM: OMAP2: Fix sparse, checkpatch warnings fro GPMC code, use ioremap (diff)
downloadkernel-qcow2-linux-646e3ed1a349fbccce651fed2d3987f0e7b0f0f4.tar.gz
kernel-qcow2-linux-646e3ed1a349fbccce651fed2d3987f0e7b0f0f4.tar.xz
kernel-qcow2-linux-646e3ed1a349fbccce651fed2d3987f0e7b0f0f4.zip
ARM: OMAP2: Misc updates from linux-omap tree
Misc updates from linux-omap tree, mostly to update common device initialization and add missing defines from linux-omap tree. Also some changes to make room for adding 34xx in following patches. Note that the I2C resources are now set up in arch/arm/plat-omap/i2c.c helper, and can be removed from devices.c. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/mach/hardware.h')
-rw-r--r--arch/arm/plat-omap/include/mach/hardware.h2
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 abb01e471c4c..29c849f5f18e 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__