diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2011-03-07 05:18:55 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-08 07:24:23 -0500 |
| commit | cba57eb7d55923b74ed8c7d1dd97ecf98b7bba77 (patch) | |
| tree | b67026dd1dc4f5a72ce08a4776fc725ca22aec41 /arch/arm/mach-imx/devices-imx25.h | |
| parent | 164f7b5237cca2701dd2943928ec8d078877a28d (diff) | |
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 <s.hauer@pengutronix.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/devices-imx25.h')
| -rw-r--r-- | arch/arm/mach-imx/devices-imx25.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; | |||
| 81 | 81 | ||
| 82 | extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst; | 82 | extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst; |
| 83 | #define imx25_add_spi_imx(id, pdata) \ | 83 | #define imx25_add_spi_imx(id, pdata) \ |
| 84 | imx_add_spi_imx(&imx25_spi_imx_data[id], pdata) | 84 | imx_add_spi_imx(&imx25_cspi_data[id], pdata) |
| 85 | #define imx25_add_spi_imx0(pdata) imx25_add_spi_imx(0, pdata) | 85 | #define imx25_add_spi_imx0(pdata) imx25_add_spi_imx(0, pdata) |
| 86 | #define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata) | 86 | #define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata) |
| 87 | #define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata) | 87 | #define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata) |