diff --git a/[refs] b/[refs]
index 043ff213e375..58ee1777a6e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 103a1754894eecf488103f7739061e7e767049ad
+refs/heads/master: e6816f34e4ee237fc1b54e0357e9ea31462ad411
diff --git a/trunk/arch/arm/mach-pxa/magician.c b/trunk/arch/arm/mach-pxa/magician.c
index b0dc18110225..0160cd8f6c65 100644
--- a/trunk/arch/arm/mach-pxa/magician.c
+++ b/trunk/arch/arm/mach-pxa/magician.c
@@ -29,6 +29,7 @@
 #include <asm/arch/magician.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/pxafb.h>
+#include <asm/arch/i2c.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/ohci.h>
 
@@ -201,6 +202,7 @@ static struct platform_device *devices[] __initdata = {
 static void __init magician_init(void)
 {
 	platform_add_devices(devices, ARRAY_SIZE(devices));
+	pxa_set_i2c_info(NULL);
 	pxa_set_ohci_info(&magician_ohci_info);
 	pxa_set_ficp_info(&magician_ficp_info);
 	set_pxa_fb_info(&toppoly_info);