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 <[email protected]>
pllopis · Oct 7, 2012 · 823bba8 · 823bba8
1 parent c0f72d7
commit 823bba8
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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"