Merge branch 'master' of ../mmc
authorPierre Ossman <drzeus@drzeus.cx>
Wed, 31 Dec 2008 18:56:05 +0000 (19:56 +0100)
committerPierre Ossman <drzeus@drzeus.cx>
Wed, 31 Dec 2008 18:56:05 +0000 (19:56 +0100)
drivers/mmc/host/at91_mci.c
drivers/mmc/host/sdricoh_cs.c

index 1f8b5b36222c26645576c3a338673839178ad267..e556d42cc45a755597e435e54e21235113611505 100644 (file)
@@ -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
         */
index d4748a8e0deda6fd2e1e05adaa20f7749d72c077..cb41e9c3ac07cce58a2d96c00bff6cda57ec5c55 100644 (file)
@@ -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,
 };