diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 22:44:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 22:44:18 +0100 |
| commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
| tree | dba464da61167d84b4f7470edebd5a769a78f9ee /drivers/mmc/host | |
| parent | 91fed558d0f33c74477569f50ed883fe6d430f1f (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/omap.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index a6c32904014..2dba999caf2 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -33,7 +33,7 @@ #include <plat/board.h> #include <plat/mmc.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/dma.h> #include <plat/mux.h> #include <plat/fpga.h> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 18b0bd31de7..21b00cefae6 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -21,7 +21,9 @@ #include <linux/mmc/card.h> #include <linux/mmc/host.h> -#include <mach/gpio.h> +#include <asm/gpio.h> + +#include <mach/gpio-tegra.h> #include <mach/sdhci.h> #include "sdhci-pltfm.h" |