From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 18:08:03 +0000 (-0700)
Subject: ARM: tegra: fix mismerges of header file inclusions
X-Git-Tag: next-20121003~10^2^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0d53d40da27d04a4fd260973f27330bcc0e1a20c;p=karo-tx-linux.git

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 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"