From: Colin Cross <ccross@android.com>
Date: Fri, 29 Oct 2010 04:03:22 +0000 (-0700)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~395
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4ec1b2a52cd1600a6cf37cc2ab43fdd77e8a4b3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
	drivers/mmc/host/sdhci-tegra.c

Change-Id: I9716a3c3a89d9a442d662cc402e1e4fdde1c3be4
---

b4ec1b2a52cd1600a6cf37cc2ab43fdd77e8a4b3
diff --cc drivers/mmc/host/sdhci-tegra.c
index 9d2d4f64b262,361c8e780683..65a671d20e0d
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@@ -33,10 -33,6 +33,7 @@@
  struct tegra_sdhci_host {
  	struct sdhci_host *sdhci;
  	struct clk *clk;
 +	struct tegra_sdhci_platform_data *plat;
- 	int clk_enabled;
  };
  
  static irqreturn_t carddetect_irq(int irq, void *data)