From: Baruch Siach Date: Mon, 7 Mar 2011 10:18:55 +0000 (+0200) Subject: ARM: imx/mx25: fix (again) spi device registration typo X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cba57eb7d55923b74ed8c7d1dd97ecf98b7bba77;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git ARM: imx/mx25: fix (again) spi device registration typo This typo was fixed in 46e3f30 (mx25: fix spi device registration typo), but a the merge at 0e44e059 (Merge commit 'v2.6.37-rc4' into imx-for-2.6.38) resolved the merge conflict wrongly. Cc: Sascha Hauer Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer --- diff --git a/arch/arm/mach-imx/devices-imx25.h b/arch/arm/mach-imx/devices-imx25.h index bde33caf1b90..d1ea79a6f800 100644 --- a/arch/arm/mach-imx/devices-imx25.h +++ b/arch/arm/mach-imx/devices-imx25.h @@ -81,7 +81,7 @@ imx25_sdhci_esdhc_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_spi_imx_data[id], pdata) + imx_add_spi_imx(&imx25_cspi_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)