diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 01:51:07 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 01:51:07 -0800 |
| commit | 0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch) | |
| tree | d2ca69347816c27f9dc352581f5d0fe76811cd49 /drivers/mmc/host/via-sdmmc.c | |
| parent | Input: elantech - add resolution query support for v4 hardware (diff) | |
| parent | Linux 3.2-rc3 (diff) | |
| download | linux-dev-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.tar.xz linux-dev-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.zip | |
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'drivers/mmc/host/via-sdmmc.c')
| -rw-r--r-- | drivers/mmc/host/via-sdmmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c index 4dfe2c02ea91..4b83c43f950d 100644 --- a/drivers/mmc/host/via-sdmmc.c +++ b/drivers/mmc/host/via-sdmmc.c @@ -9,6 +9,7 @@ */ #include <linux/pci.h> +#include <linux/module.h> #include <linux/dma-mapping.h> #include <linux/highmem.h> #include <linux/delay.h> @@ -1191,7 +1192,7 @@ static void __devexit via_sd_remove(struct pci_dev *pcidev) mmiowb(); if (sdhost->mrq) { - printk(KERN_ERR "%s: Controller removed during " + pr_err("%s: Controller removed during " "transfer\n", mmc_hostname(sdhost->mmc)); /* make sure all DMA is stopped */ |