Commit 823bba8f authored Sep 22, 2012 by Olof Johansson

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>

parent c0f72d7c

drivers/mmc/host/sdhci-tegra.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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"