Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cba57eb7 authored by Baruch Siach's avatar Baruch Siach Committed by Sascha Hauer
Browse files

ARM: imx/mx25: fix (again) spi device registration typo 



This typo was fixed in 46e3f307 (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 <s.hauer@pengutronix.de>
Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 164f7b52

arch/arm/mach-imx/devices-imx25.h

+1 −1
Original line number Diff line number Diff line
@@ -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)