From b249c2f6ad1ffd6e242d363c3b09958c65469719 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <drzeus@drzeus.cx>
Date: Wed, 31 Dec 2008 19:56:05 +0100
Subject: [PATCH] --- yaml --- r: 125517 b: refs/heads/master c:
 418f19ea17a99421b22a64e101e14b6a16bed66d h: refs/heads/master i:   125515:
 324ca88cf4548f7281945be95f5bc53db85b0998 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/mmc/host/at91_mci.c   | 4 ++--
 trunk/drivers/mmc/host/sdricoh_cs.c | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ad21e2b0b7b5..05a5cffcb35f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6e10b865c3ea56bdaa8c6ecfee313b997900dbb
+refs/heads/master: 418f19ea17a99421b22a64e101e14b6a16bed66d
diff --git a/trunk/drivers/mmc/host/at91_mci.c b/trunk/drivers/mmc/host/at91_mci.c
index 1f8b5b36222c..e556d42cc45a 100644
--- a/trunk/drivers/mmc/host/at91_mci.c
+++ b/trunk/drivers/mmc/host/at91_mci.c
@@ -1088,6 +1088,8 @@ static int __init at91_mci_probe(struct platform_device *pdev)
 		goto fail0;
 	}
 
+	setup_timer(&host->timer, at91_timeout_timer, (unsigned long)host);
+
 	platform_set_drvdata(pdev, mmc);
 
 	/*
@@ -1101,8 +1103,6 @@ static int __init at91_mci_probe(struct platform_device *pdev)
 
 	mmc_add_host(mmc);
 
-	setup_timer(&host->timer, at91_timeout_timer, (unsigned long)host);
-
 	/*
 	 * monitor card insertion/removal if we can
 	 */
diff --git a/trunk/drivers/mmc/host/sdricoh_cs.c b/trunk/drivers/mmc/host/sdricoh_cs.c
index d4748a8e0ded..cb41e9c3ac07 100644
--- a/trunk/drivers/mmc/host/sdricoh_cs.c
+++ b/trunk/drivers/mmc/host/sdricoh_cs.c
@@ -82,6 +82,8 @@ static struct pcmcia_device_id pcmcia_ids[] = {
 	/* vendor and device strings followed by their crc32 hashes */
 	PCMCIA_DEVICE_PROD_ID12("RICOH", "Bay1Controller", 0xd9f522ed,
 				0xc3901202),
+	PCMCIA_DEVICE_PROD_ID12("RICOH", "Bay Controller", 0xd9f522ed,
+				0xace80909),
 	PCMCIA_DEVICE_NULL,
 };