From c3008c10cc12a0d226a77b8a17719b53710bd4cb Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Sun, 19 Aug 2007 22:32:10 +0900
Subject: [PATCH] --- yaml --- r: 64511 b: refs/heads/master c:
 9f90a03a7f93be7f247aa902a7d962a56a6f600e h: refs/heads/master i:   64509:
 7d7a74dfe978a4efe225079718078e0f76e6bb5d   64507:
 7ab196682c2b21767dd65b9b293d15b94a5f8f50   64503:
 a05c4bbc44ebe1fc33924c0579822ef3d2e4d856   64495:
 6ca6901ca91deaa083cbc1d8d9dc7d679c88962c   64479:
 299b725e762207fbf7e35f5ea80fff67a3e52230   64447:
 1ecc9f49887c3e07aeb05c0ce9cd6e48ac4676b7   64383:
 72c4e9e8dd8f0005e32bd78bbd8facf4aa18811c   64255:
 4024b621af56498fcaba69dcce0aabcd7ce79757   63999:
 52f3550bfbfb933129ec064457126de1a733f355   63487:
 8031156924b9ef682436918f5ea3f5b322cdd5a0 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/mips/tx4938/toshiba_rbtx4938/setup.c | 2 +-
 trunk/drivers/rtc/rtc-rs5c348.c                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b22d4081279d..6a29a3b5814d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c99dcac435cec7aca313638db2f1bc406f29210b
+refs/heads/master: 9f90a03a7f93be7f247aa902a7d962a56a6f600e
diff --git a/trunk/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/trunk/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index 57f3c705d082..84ebff711e6e 100644
--- a/trunk/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/trunk/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -1115,7 +1115,7 @@ static void __init txx9_spi_init(unsigned long base, int irq)
 static int __init rbtx4938_spi_init(void)
 {
 	struct spi_board_info srtc_info = {
-		.modalias = "rs5c348",
+		.modalias = "rtc-rs5c348",
 		.max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */
 		.bus_num = 0,
 		.chip_select = 16 + SRTC_CS,
diff --git a/trunk/drivers/rtc/rtc-rs5c348.c b/trunk/drivers/rtc/rtc-rs5c348.c
index f50f3fc353cd..839462659afa 100644
--- a/trunk/drivers/rtc/rtc-rs5c348.c
+++ b/trunk/drivers/rtc/rtc-rs5c348.c
@@ -226,7 +226,7 @@ static int __devexit rs5c348_remove(struct spi_device *spi)
 
 static struct spi_driver rs5c348_driver = {
 	.driver = {
-		.name	= "rs5c348",
+		.name	= "rtc-rs5c348",
 		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},