Skip to contentSkip to conversation

MMC update

GIT PULL Pierre Ossman 1 participant 1 message Dec 5, 2006 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

Linus, please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus

to receive the following updates:

 drivers/mmc/au1xmmc.c |    2 +-
 drivers/mmc/pxamci.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Sascha Hauer:
mmc: pxamci compilation fix

Yoichi Yuasa:
mmc: fix au1xmmc build error

drivers/mmc/au1xmmc.c +1 -1
index 447fba5..800527c 100644
@@ -875,7 +875,7 @@ static void au1xmmc_init_dma(struct au1x
        host->rx_chan = rxchan;
 }
 
-struct const mmc_host_ops au1xmmc_ops = {
+static const struct mmc_host_ops au1xmmc_ops = {
        .request        = au1xmmc_request,
        .set_ios        = au1xmmc_set_ios,
 };
drivers/mmc/pxamci.c +2 -2
index 471e9f4..45a9283 100644
@@ -355,7 +355,7 @@ static int pxamci_get_ro(struct mmc_host
        struct pxamci_host *host = mmc_priv(mmc);
 
        if (host->pdata && host->pdata->get_ro)
-               return host->pdata->get_ro(mmc->dev);
+               return host->pdata->get_ro(mmc_dev(mmc));
        /* Host doesn't support read only detection so assume writeable */
        return 0;
 }
@@ -383,7 +383,7 @@ static void pxamci_set_ios(struct mmc_ho
                host->power_mode = ios->power_mode;
 
                if (host->pdata && host->pdata->setpower)
-                       host->pdata->setpower(mmc->dev, ios->vdd);
+                       host->pdata->setpower(mmc_dev(mmc), ios->vdd);
 
                if (ios->power_mode == MMC_POWER_ON)
                        host->cmdat |= CMDAT_INIT;
Signature · 5 lines
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org