summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-22 11:08:03 -0700
committerOlof Johansson <olof@lixom.net>2012-10-07 07:02:06 -0700
commit823bba8ff16be79aa5f6480de38fa2fbd3f4ddd5 (patch)
treeba2108e91bc53cc39e4cb52b1349b4923f361eca /drivers/mmc
parentc0f72d7cde7e289f45278c4360ce452556ccb9aa (diff)
downloadlinux-stable-823bba8ff16be79aa5f6480de38fa2fbd3f4ddd5.tar.gz
linux-stable-823bba8ff16be79aa5f6480de38fa2fbd3f4ddd5.tar.bz2
linux-stable-823bba8ff16be79aa5f6480de38fa2fbd3f4ddd5.zip
ARM: tegra: fix mismerges of header file inclusions
Another mishandled merge conflict by me, where the header file renames and the removal of gpio includes clashed and I chose the wrong end result. Fixes build breakage for tegra_defconfig. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-tegra.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index d43e7462941f..aa8c4dec356e 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 <linux/platform_data/mmc-sdhci-tegra.h>
#include "sdhci-pltfm.h"