diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 18:15:35 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 18:15:35 -0700 |
| commit | 0968d01827dfcd443d293c382b47d75fbf60832f (patch) | |
| tree | 14584ac638b526d37bf60446e38200b1c3e27e40 /drivers | |
| parent | c098c9f2aae73d62a0bce1a161cfeb04273e6b35 (diff) | |
| parent | a5b64ce64d6bdceecd45a07893affbf88d7bb7d2 (diff) | |
| download | linux-0968d01827dfcd443d293c382b47d75fbf60832f.tar.bz2 | |
Merge tag 'tegra-for-3.7-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
From Stephen Warren:
This branch contains a few early cleanups; consistent use of IO_ADDRESS,
always selecting USE_OF since we're converting to device-tree-only this
merge window, and removing includes of some header files as part of
working towards single zImage.
* tag 'tegra-for-3.7-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
mmc: tegra: remove useless include of <mach/*.h>
gpio: tegra: remove useless includes of <mach/*.h>
ARM: tegra: remove duplicate select USE_OF
ARM: tegra: use IO_ADDRESS for getting virtual address
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpio-tegra.c | 3 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index dc5184d57892..d982593d7563 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -30,9 +30,6 @@ #include <asm/mach/irq.h> -#include <mach/iomap.h> -#include <mach/suspend.h> - #define GPIO_BANK(x) ((x) >> 5) #define GPIO_PORT(x) (((x) >> 3) & 0x3) #define GPIO_BIT(x) ((x) & 0x7) diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 0810ccc23d7e..5393c64de3c8 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -27,7 +27,6 @@ #include <asm/gpio.h> -#include <mach/gpio-tegra.h> #include <mach/sdhci.h> #include "sdhci-pltfm.h" |