aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/card/block.c2
-rw-r--r--drivers/mmc/host/Kconfig2
-rw-r--r--drivers/mmc/host/au1xmmc.c2
-rw-r--r--drivers/mmc/host/sdricoh_cs.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 217f82037fc1..bfc8a8ae55df 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -257,7 +257,7 @@ static u32 get_card_status(struct mmc_card *card, struct request *req)
257 cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC; 257 cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC;
258 err = mmc_wait_for_cmd(card->host, &cmd, 0); 258 err = mmc_wait_for_cmd(card->host, &cmd, 0);
259 if (err) 259 if (err)
260 printk(KERN_ERR "%s: error %d sending status comand", 260 printk(KERN_ERR "%s: error %d sending status command",
261 req->rq_disk->disk_name, err); 261 req->rq_disk->disk_name, err);
262 return cmd.resp[0]; 262 return cmd.resp[0];
263} 263}
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index c22a4c039988..afe8c6fa166a 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -501,7 +501,7 @@ config MMC_SH_MMCIF
501 tristate "SuperH Internal MMCIF support" 501 tristate "SuperH Internal MMCIF support"
502 depends on MMC_BLOCK && (SUPERH || ARCH_SHMOBILE) 502 depends on MMC_BLOCK && (SUPERH || ARCH_SHMOBILE)
503 help 503 help
504 This selects the MMC Host Interface controler (MMCIF). 504 This selects the MMC Host Interface controller (MMCIF).
505 505
506 This driver supports MMCIF in sh7724/sh7757/sh7372. 506 This driver supports MMCIF in sh7724/sh7757/sh7372.
507 507
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index 41e5a60493ad..ef72e874ca36 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -192,7 +192,7 @@ static inline void SEND_STOP(struct au1xmmc_host *host)
192 au_writel(config2 | SD_CONFIG2_DF, HOST_CONFIG2(host)); 192 au_writel(config2 | SD_CONFIG2_DF, HOST_CONFIG2(host));
193 au_sync(); 193 au_sync();
194 194
195 /* Send the stop commmand */ 195 /* Send the stop command */
196 au_writel(STOP_CMD, HOST_CMD(host)); 196 au_writel(STOP_CMD, HOST_CMD(host));
197} 197}
198 198
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c
index f472c2714eb8..bbc298fd2a15 100644
--- a/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@ -446,7 +446,7 @@ static int sdricoh_init_mmc(struct pci_dev *pci_dev,
446 mmc->max_seg_size = 1024 * 512; 446 mmc->max_seg_size = 1024 * 512;
447 mmc->max_blk_size = 512; 447 mmc->max_blk_size = 512;
448 448
449 /* reset the controler */ 449 /* reset the controller */
450 if (sdricoh_reset(host)) { 450 if (sdricoh_reset(host)) {
451 dev_dbg(dev, "could not reset\n"); 451 dev_dbg(dev, "could not reset\n");
452 result = -EIO; 452 result = -EIO;
@@ -478,7 +478,7 @@ static int sdricoh_pcmcia_probe(struct pcmcia_device *pcmcia_dev)
478 dev_info(&pcmcia_dev->dev, "Searching MMC controller for pcmcia device" 478 dev_info(&pcmcia_dev->dev, "Searching MMC controller for pcmcia device"
479 " %s %s ...\n", pcmcia_dev->prod_id[0], pcmcia_dev->prod_id[1]); 479 " %s %s ...\n", pcmcia_dev->prod_id[0], pcmcia_dev->prod_id[1]);
480 480
481 /* search pci cardbus bridge that contains the mmc controler */ 481 /* search pci cardbus bridge that contains the mmc controller */
482 /* the io region is already claimed by yenta_socket... */ 482 /* the io region is already claimed by yenta_socket... */
483 while ((pci_dev = 483 while ((pci_dev =
484 pci_get_device(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, 484 pci_get_device(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476,