diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-05-21 23:10:21 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-21 23:10:21 +0200 |
| commit | 99ae99533a059750c4b0f76295625b8ac5ea751a (patch) | |
| tree | 281129684e730ccd5b5b1e1fbbd9b83f3fa18986 /drivers/mmc | |
| parent | [ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel (diff) | |
| parent | [ARM] S3C24XX: GPIO: Change usb-simtec.c to use gpiolib. (diff) | |
| download | linux-99ae99533a059750c4b0f76295625b8ac5ea751a.tar.xz linux-99ae99533a059750c4b0f76295625b8ac5ea751a.zip | |
[ARM] S3C24XX: Merge devel-gpio
Merge branch 'devel-gpio' into for-rmk-devel
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/s3cmci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 889f35047a52..4eb4f37544ab 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -17,6 +17,7 @@ #include <linux/mmc/host.h> #include <linux/platform_device.h> #include <linux/cpufreq.h> +#include <linux/gpio.h> #include <linux/irq.h> #include <linux/io.h> @@ -1121,7 +1122,7 @@ static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) case MMC_POWER_OFF: default: s3c2410_gpio_setpin(S3C2410_GPE5, 0); - s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_OUTP); + s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPIO_OUTPUT); if (host->is2440) mci_con |= S3C2440_SDICON_SDRESET; |