From 9bb3777cce5567a960b43b409a31e634a8ca85b8 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Tue, 11 May 2010 14:06:48 -0700 Subject: [PATCH] --- yaml --- r: 190779 b: refs/heads/master c: ebb1fea9b3adf25d7e2f643c614163af4f93a17f h: refs/heads/master i: 190777: 46e329f210678e8169ee9ec92f95e26db51a3bce 190775: 5ac198fd97d91ecb59acb2b8f9adf11838e31bab v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/atmel-mci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b680079c236b..2117ba9d6667 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34441427aab4bdb3069a4ffcda69a99357abcb2e +refs/heads/master: ebb1fea9b3adf25d7e2f643c614163af4f93a17f diff --git a/trunk/drivers/mmc/host/atmel-mci.c b/trunk/drivers/mmc/host/atmel-mci.c index 88be37d9e9a5..57d3cb2dbb5f 100644 --- a/trunk/drivers/mmc/host/atmel-mci.c +++ b/trunk/drivers/mmc/host/atmel-mci.c @@ -1751,13 +1751,13 @@ static int __init atmci_probe(struct platform_device *pdev) ret = -ENODEV; if (pdata->slot[0].bus_width) { ret = atmci_init_slot(host, &pdata->slot[0], - MCI_SDCSEL_SLOT_A, 0); + 0, MCI_SDCSEL_SLOT_A); if (!ret) nr_slots++; } if (pdata->slot[1].bus_width) { ret = atmci_init_slot(host, &pdata->slot[1], - MCI_SDCSEL_SLOT_B, 1); + 1, MCI_SDCSEL_SLOT_B); if (!ret) nr_slots++; }