Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
	drivers/mmc/core/core.c
	drivers/mmc/core/sd.c
	drivers/mmc/host/au1xmmc.c

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
index 7f570b5b2a09ca51cd07fe657eccc3808592fb38,c49e84a39a6fe5ce61edd323c371617f8089addf..6bfcd484d4347591c26a0a6a23dded8a1b46f62d
--- 1/arch/arm/mach-at91/at91sam9260_devices.c
--- 2/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@@ -327,10 -319,10 +327,10 @@@ void __init at91_add_device_mci(short m
        if (!data)
                return;
  
-       for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) {
+       for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
                if (data->slot[i].bus_width) {
                        /* input/irq */
 -                      if (data->slot[i].detect_pin) {
 +                      if (gpio_is_valid(data->slot[i].detect_pin)) {
                                at91_set_gpio_input(data->slot[i].detect_pin, 1);
                                at91_set_deglitch(data->slot[i].detect_pin, 1);
                        }

diff --cc arch/arm/mach-shmobile/board-ag5evm.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc drivers/mmc/host/Kconfig
Simple merge

diff --cc drivers/mmc/host/at91_mci.c
Simple merge

diff --cc drivers/mmc/host/au1xmmc.c
index 56e7834685d9f81f2c1a152be0fff65fb8caf4c8,707bc7dddd226a1d29405efefa2bc2e853f13d1a..b381c2f465276c0a96ba6ce9725e2e9f2b24a836
--- 1/drivers/mmc/host/au1xmmc.c
--- 2/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@@ -1036,12 -1028,11 +1036,11 @@@ static int __devinit au1xmmc_probe(stru
        tasklet_init(&host->finish_task, au1xmmc_tasklet_finish,
                        (unsigned long)host);
  
 -#ifdef CONFIG_SOC_AU1200
 -      ret = au1xmmc_dbdma_init(host);
 -      if (ret)
 -              pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
 -#endif
 +      if (has_dbdma()) {
 +              ret = au1xmmc_dbdma_init(host);
 +              if (ret)
-                       printk(KERN_INFO DRIVER_NAME ": DBDMA init failed; "
-                                                    "using PIO\n");
++                      pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
 +      }
  
  #ifdef CONFIG_LEDS_CLASS
        if (host->platdata && host->platdata->led) {
@@@ -1189,15 -1181,15 +1188,15 @@@ static struct platform_driver au1xmmc_d
  
  static int __init au1xmmc_init(void)
  {
 -#ifdef CONFIG_SOC_AU1200
 -      /* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
 -       * of 8 bits.  And since devices are shared, we need to create
 -       * our own to avoid freaking out other devices.
 -       */
 -      memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
 -      if (!memid)
 -              pr_err("au1xmmc: cannot add memory dbdma dev\n");
 -#endif
 +      if (has_dbdma()) {
 +              /* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
 +              * of 8 bits.  And since devices are shared, we need to create
 +              * our own to avoid freaking out other devices.
 +              */
 +              memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
 +              if (!memid)
-                       printk(KERN_ERR "au1xmmc: cannot add memory dbdma\n");
++                      pr_err("au1xmmc: cannot add memory dbdma dev\n");
 +      }
        return platform_driver_register(&au1xmmc_driver);
  }
  

diff --cc drivers/mmc/host/mmci.c
Simple merge

diff --cc drivers/mmc/host/s3cmci.c
Simple merge

diff --cc drivers/mmc/host/sdhci-tegra.c
index 21b00cefae63f2372dd14ee96453bc9c6f68bd6e,e9e061bf7d0c7d5056e486e3f6815fa330713b4b..067a4cded9cf7b592938aa24b306679c5038141a
--- 1/drivers/mmc/host/sdhci-tegra.c
--- 2/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@@ -20,10 -22,9 +22,11 @@@
  #include <linux/gpio.h>
  #include <linux/mmc/card.h>
  #include <linux/mmc/host.h>
+ #include <linux/module.h>
  
 -#include <mach/gpio.h>
 +#include <asm/gpio.h>
 +
 +#include <mach/gpio-tegra.h>
  #include <mach/sdhci.h>
  
  #include "sdhci-pltfm.h"

diff --cc lib/Kconfig.debug
Simple merge