diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 17:47:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 17:47:07 +0100 |
| commit | 1709775828de83b099554176b6d4971ebc772962 (patch) | |
| tree | 27541264c99d58477f9262ee7074cf7d7e5f7907 /drivers | |
| parent | [PATCH] proc_misc build fix (diff) | |
| parent | mmc: fix au1xmmc build error (diff) | |
| download | linux-1709775828de83b099554176b6d4971ebc772962.tar.xz linux-1709775828de83b099554176b6d4971ebc772962.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: fix au1xmmc build error
mmc: pxamci compilation fix
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/au1xmmc.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/pxamci.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c index 447fba5825fd..800527cf40d5 100644 --- a/drivers/mmc/au1xmmc.c +++ b/drivers/mmc/au1xmmc.c @@ -875,7 +875,7 @@ static void au1xmmc_init_dma(struct au1xmmc_host *host) 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, }; diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index 471e9f4e0530..45a9283ce498 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c @@ -355,7 +355,7 @@ static int pxamci_get_ro(struct mmc_host *mmc) 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_host *mmc, struct mmc_ios *ios) 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; |