diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:47:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:47:07 -0500 |
| commit | 1709775828de83b099554176b6d4971ebc772962 (patch) | |
| tree | 27541264c99d58477f9262ee7074cf7d7e5f7907 /drivers/mmc/au1xmmc.c | |
| parent | 7bf65382caeecea4ae7206138e92e732b676d6e5 (diff) | |
| parent | bf8c80a6a5153e7f170f240731c650eeed6d78ff (diff) | |
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/mmc/au1xmmc.c')
| -rw-r--r-- | drivers/mmc/au1xmmc.c | 2 |
1 files changed, 1 insertions, 1 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) | |||
| 875 | host->rx_chan = rxchan; | 875 | host->rx_chan = rxchan; |
| 876 | } | 876 | } |
| 877 | 877 | ||
| 878 | struct const mmc_host_ops au1xmmc_ops = { | 878 | static const struct mmc_host_ops au1xmmc_ops = { |
| 879 | .request = au1xmmc_request, | 879 | .request = au1xmmc_request, |
| 880 | .set_ios = au1xmmc_set_ios, | 880 | .set_ios = au1xmmc_set_ios, |
| 881 | }; | 881 | }; |