diff options
author | Tony Lindgren <tony@atomide.com> | 2008-10-06 15:49:36 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-10-06 15:49:36 +0300 |
commit | 646e3ed1a349fbccce651fed2d3987f0e7b0f0f4 (patch) | |
tree | b9c4d52027da1468e52294f3f8db3afb0720c86d /arch/arm/plat-omap/include/mach/hardware.h | |
parent | fd1dc87ded0f29c1ba1e8da62f03ab0d591d9bdd (diff) | |
download | kernel_samsung_smdk4412-646e3ed1a349fbccce651fed2d3987f0e7b0f0f4.zip kernel_samsung_smdk4412-646e3ed1a349fbccce651fed2d3987f0e7b0f0f4.tar.gz kernel_samsung_smdk4412-646e3ed1a349fbccce651fed2d3987f0e7b0f0f4.tar.bz2 |
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.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 abb01e4..29c849f 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__ |