From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 6 Dec 2010 08:36:17 +0000 (+0100)
Subject: Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
X-Git-Tag: v2.6.38-rc1~38^2~3^2~54
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0e44e059;p=karo-tx-linux.git

Merge commit 'v2.6.37-rc4' into imx-for-2.6.38

Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

0e44e059588e1d91f3a1974d2ce3348864d1d799
diff --cc arch/arm/mach-imx/devices-imx25.h
index 760e66c57c1b,d94d282fa676..bde33caf1b90
--- a/arch/arm/mach-imx/devices-imx25.h
+++ b/arch/arm/mach-imx/devices-imx25.h
@@@ -74,14 -42,9 +74,14 @@@ extern const struct imx_mxc_nand_data i
  #define imx25_add_mxc_nand(pdata)	\
  	imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)
  
 +extern const struct imx_sdhci_esdhc_imx_data
 +imx25_sdhci_esdhc_imx_data[] __initconst;
 +#define imx25_add_sdhci_esdhc_imx(id, pdata)	\
 +	imx_add_sdhci_esdhc_imx(&imx25_sdhci_esdhc_imx_data[id], pdata)
 +
- extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;
+ extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst;
  #define imx25_add_spi_imx(id, pdata)	\
 -	imx_add_spi_imx(&imx25_cspi_data[id], pdata)
 +	imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)
  #define imx25_add_spi_imx0(pdata)	imx25_add_spi_imx(0, pdata)
  #define imx25_add_spi_imx1(pdata)	imx25_add_spi_imx(1, pdata)
  #define imx25_add_spi_imx2(pdata)	imx25_add_spi_imx(2, pdata)
diff --cc arch/arm/plat-mxc/devices/platform-spi_imx.c
index e1ffa1f665e2,17f724c9452d..8ea49adcdfc1
--- a/arch/arm/plat-mxc/devices/platform-spi_imx.c
+++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c
@@@ -27,9 -27,10 +27,10 @@@ const struct imx_spi_imx_data imx21_csp
  	imx_spi_imx_data_entry(MX21, CSPI, "imx21-cspi", _id, _hwid, SZ_4K)
  	imx21_cspi_data_entry(0, 1),
  	imx21_cspi_data_entry(1, 2),
+ };
  #endif
  
 -#ifdef CONFIG_ARCH_MX25
 +#ifdef CONFIG_SOC_IMX25
  const struct imx_spi_imx_data imx25_cspi_data[] __initconst = {
  #define imx25_cspi_data_entry(_id, _hwid)				\
  	imx_spi_imx_data_entry(MX25, CSPI, "imx25-cspi", _id, _hwid, SZ_16K)