leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  mmc: fix au1xmmc build error
  mmc: pxamci compilation fix
This commit is contained in:
Linus Torvalds 2006-12-08 08:47:07 -08:00
commit 1709775828
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mmc/au1xmmc.c
View File

@ -875,7 +875,7 @@ static void au1xmmc_init_dma(struct au1xmmc_host *host)
host->rx_chan = rxchan; host->rx_chan = rxchan;
} }
struct const mmc_host_ops au1xmmc_ops = { static const struct mmc_host_ops au1xmmc_ops = {
.request = au1xmmc_request, .request = au1xmmc_request,
.set_ios = au1xmmc_set_ios, .set_ios = au1xmmc_set_ios,
}; };

4
drivers/mmc/pxamci.c
View File

@ -355,7 +355,7 @@ static int pxamci_get_ro(struct mmc_host *mmc)
struct pxamci_host *host = mmc_priv(mmc); struct pxamci_host *host = mmc_priv(mmc);
if (host->pdata && host->pdata->get_ro) 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 */ /* Host doesn't support read only detection so assume writeable */
return 0; 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; host->power_mode = ios->power_mode;
if (host->pdata && host->pdata->setpower) 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) if (ios->power_mode == MMC_POWER_ON)
host->cmdat |= CMDAT_INIT; host->cmdat |= CMDAT_INIT;