From: Erik Gilling <konkers@android.com>
Date: Wed, 27 Oct 2010 01:24:50 +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~406
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2afff3d793abe049442923fc5a1e4b5864408629;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: I52c329c835d80d868c731b23ca2d9dfad6e6586e
---

2afff3d793abe049442923fc5a1e4b5864408629
diff --cc drivers/mmc/host/sdhci-tegra.c
index 65a671d20e0d,35ec8e385db8..9d2d4f64b262
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@@ -33,7 -35,7 +35,8 @@@
  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)