X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fboard-generic.c;h=6e7b13215c4cf3f7e852654c2bcd85a6eae142ca;hb=9b1520ccf7a9eecba20d61366695c6abd2a24230;hp=90938151bcf1340df536283c8b1053c5f0b50655;hpb=e30fdb1e026c2d05f216d2e5a25bfafdfd261ec2;p=linux-2.6-omap-h63xx.git

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 90938151bcf..6e7b13215c4 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -51,7 +51,7 @@ static struct omap_mmc_config generic_mmc_config __initdata = {
 	},
 };
 
-static struct omap_board_config_kernel generic_config[] = {
+static struct omap_board_config_kernel generic_config[] __initdata = {
 	{ OMAP_TAG_UART,	&generic_uart_config },
 	{ OMAP_TAG_MMC,		&generic_mmc_config },
 };
@@ -61,10 +61,13 @@ static void __init omap_generic_init(void)
 	omap_board_config = generic_config;
 	omap_board_config_size = ARRAY_SIZE(generic_config);
 	omap_serial_init();
+	omap_register_i2c_bus(1, 100, NULL, 0);
+	omap_register_i2c_bus(2, 100, NULL, 0);
 }
 
 static void __init omap_generic_map_io(void)
 {
+	omap2_set_globals_242x(); /* should be 242x, 243x, or 343x */
 	omap2_map_common_io();
 }