---

yaml --- r: 319299 b: refs/heads/master c: 080e0d1 h: refs/heads/master i: 319297: 9abf55c 319295: dc675b7 v: v3
git-mirror · Jun 21, 2012 · 40fd2bb · 40fd2bb
1 parent 0682c29
commit 40fd2bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: accb90c8f3b5c22c9d2893c775e98abb4a0d6bd3
+refs/heads/master: 080e0d1384a3fce16b7d5324dbfc47c136cc3573
diff --git a/trunk/arch/arm/configs/kzm9g_defconfig b/trunk/arch/arm/configs/kzm9g_defconfig
@@ -108,6 +108,7 @@ CONFIG_MMC_SH_MMCIF=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_RS5C372=y
 CONFIG_DMADEVICES=y
 CONFIG_SH_DMAE=y
 CONFIG_ASYNC_TX_DMA=y

diff --git a/trunk/arch/arm/mach-shmobile/board-kzm9g.c b/trunk/arch/arm/mach-shmobile/board-kzm9g.c
@@ -338,6 +338,9 @@ static struct pcf857x_platform_data pcf8575_pdata = {
 static struct i2c_board_info i2c0_devices[] = {
 	{
 		I2C_BOARD_INFO("ak4648", 0x12),
+	},
+	{
+		I2C_BOARD_INFO("r2025sd", 0x32),
 	}
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -338,6 +338,9 @@ static struct pcf857x_platform_data pcf8575_pdata = { @@
     static struct i2c_board_info i2c0_devices[] = {
     	{
     		I2C_BOARD_INFO("ak4648", 0x12),
+    	},
+    	{
+    		I2C_BOARD_INFO("r2025sd", 0x32),
     	}
     };
@@ Expand Down @@