[ARM] S3C24XX: Merge devel-gpio

Merge branch 'devel-gpio' into for-rmk-devel

diff --combined drivers/mmc/host/s3cmci.c
index 889f35047a52635ca77a8fb0bf3b3e073fddc34a,2e7da8e853cf8e96c996e3fb4a9199d4c13bed49..4eb4f37544ab5c37a426393a9e614d4eca4e27a8
--- 1/drivers/mmc/host/s3cmci.c
--- 2/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@@ -17,6 -17,7 +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>
  
@@@ -789,7 -790,7 +790,7 @@@ static void s3cmci_dma_setup(struct s3c
  
        last_source = source;
  
 -      s3c2410_dma_devconfig(host->dma, source, 3,
 +      s3c2410_dma_devconfig(host->dma, source,
                              host->mem->start + host->sdidata);
  
        if (!setup_ok) {
@@@ -1121,7 -1122,7 +1122,7 @@@ static void s3cmci_set_ios(struct mmc_h
        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;