From 2640a5a597c386c31f5663d22910e4c2d609e18d Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@sirena.org.uk>
Date: Mon, 7 Apr 2008 17:16:34 +0100
Subject: [PATCH] --- yaml --- r: 91239 b: refs/heads/master c:
 835e7f1c9ab03db6aa51973aee71d13ccb09cb19 h: refs/heads/master i:   91237:
 ee566951356a83ffe311869f06f45b41d1e9f19c   91235:
 cc2da56647340e343173471ae7d9098040eb6d6c   91231:
 ea23f1d4701d245326f102f22212c5e9d6b7bd2a v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-pxa/mainstone.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b19a4311e967..bcd7486dd630 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90b8fc34968d3f6c70e309d97597682f119220b9
+refs/heads/master: 835e7f1c9ab03db6aa51973aee71d13ccb09cb19
diff --git a/trunk/arch/arm/mach-pxa/mainstone.c b/trunk/arch/arm/mach-pxa/mainstone.c
index e0f5f97e967f..18d47cfa2a18 100644
--- a/trunk/arch/arm/mach-pxa/mainstone.c
+++ b/trunk/arch/arm/mach-pxa/mainstone.c
@@ -46,6 +46,7 @@
 #include <asm/arch/mainstone.h>
 #include <asm/arch/audio.h>
 #include <asm/arch/pxafb.h>
+#include <asm/arch/i2c.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/ohci.h>
@@ -637,6 +638,7 @@ static void __init mainstone_init(void)
 	pxa_set_mci_info(&mainstone_mci_platform_data);
 	pxa_set_ficp_info(&mainstone_ficp_platform_data);
 	pxa_set_ohci_info(&mainstone_ohci_platform_data);
+	pxa_set_i2c_info(NULL);
 
 	mainstone_init_keypad();
 }