projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c0f72d7)
ARM: tegra: fix mismerges of header file inclusions
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 18:08:03 +0000 (11:08 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 7 Oct 2012 14:02:06 +0000 (07:02 -0700)
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>
drivers/mmc/host/sdhci-tegra.c patch | blob | blame | history

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"