From fd5125822ef7c6a3ac902c1ceb156ca86e3c5e84 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 26 Jul 2011 10:59:32 +0100
Subject: [PATCH] --- yaml --- r: 269393 b: refs/heads/master c:
 e6b750d4ba2fda038ba8e37eda59ec49d31ae88b h: refs/heads/master i:   269391:
 547966075d32537e01e15f89dbce8e9f0cf9a3ad v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/mmc/host/sdhci-tegra.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 38eb4d202a77..fc0921f82e84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb049419050f572d09c592fd103eaa90a8b6d9fe
+refs/heads/master: e6b750d4ba2fda038ba8e37eda59ec49d31ae88b
diff --git a/trunk/drivers/mmc/host/sdhci-tegra.c b/trunk/drivers/mmc/host/sdhci-tegra.c
index 18b0bd31de78..e9094f14659d 100644
--- a/trunk/drivers/mmc/host/sdhci-tegra.c
+++ b/trunk/drivers/mmc/host/sdhci-tegra.c
@@ -21,7 +21,7 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
 
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #include <mach/sdhci.h>
 
 #include "sdhci-pltfm.h"