diff --git a/[refs] b/[refs]
index 0fecf5d4092a..93743dc187ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acf5eda92da23c904d1e37ba80c75572f3e2c860
+refs/heads/master: 3b7998f529a18696baafb8cca63a7720565ad77f
diff --git a/trunk/arch/arm/mach-s5pv310/Kconfig b/trunk/arch/arm/mach-s5pv310/Kconfig
index 6b2b948c9ccd..f12f560894ad 100644
--- a/trunk/arch/arm/mach-s5pv310/Kconfig
+++ b/trunk/arch/arm/mach-s5pv310/Kconfig
@@ -57,6 +57,8 @@ config MACH_UNIVERSAL_C210
 	bool "Mobile UNIVERSAL_C210 Board"
 	select CPU_S5PV310
 	select S5P_DEV_ONENAND
+	select S3C_DEV_I2C1
+	select S5PV310_SETUP_I2C1
 	help
 	  Machine support for Samsung Mobile Universal S5PC210 Reference
 	  Board. S5PC210(MCP) is one of package option of S5PV310
diff --git a/trunk/arch/arm/mach-s5pv310/mach-universal_c210.c b/trunk/arch/arm/mach-s5pv310/mach-universal_c210.c
index e16984963e89..deffeb1be3b9 100644
--- a/trunk/arch/arm/mach-s5pv310/mach-universal_c210.c
+++ b/trunk/arch/arm/mach-s5pv310/mach-universal_c210.c
@@ -10,6 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
 #include <linux/input.h>
+#include <linux/i2c.h>
 #include <linux/gpio_keys.h>
 #include <linux/gpio.h>
 
@@ -116,6 +117,16 @@ static struct platform_device universal_gpio_keys = {
 	},
 };
 
+/* I2C0 */
+static struct i2c_board_info i2c0_devs[] __initdata = {
+	/* Camera, To be updated */
+};
+
+/* I2C1 */
+static struct i2c_board_info i2c1_devs[] __initdata = {
+	/* Gyro, To be updated */
+};
+
 static struct platform_device *universal_devices[] __initdata = {
 	&universal_gpio_keys,
 	&s5p_device_onenand,
@@ -134,6 +145,9 @@ static void __init universal_machine_init(void)
 	l2x0_init(S5P_VA_L2CC, 1 << 28, 0xffffffff);
 #endif
 
+	i2c_register_board_info(0, i2c0_devs, ARRAY_SIZE(i2c0_devs));
+	i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
+
 	/* Last */
 	platform_add_devices(universal_devices, ARRAY_SIZE(universal_devices));
 }