ARM: tegra: fix mismerges of header file inclusions

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index d43e7462941fbd24bdecdb1063b8b4501a53bee8..aa8c4dec356e585e69b5489dcc3f234364e51bbc 100644 (file)
--- 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"