diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-imx/devices-imx1.h | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/mach-imx/devices-imx1.h')
| -rw-r--r-- | arch/arm/mach-imx/devices-imx1.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/devices-imx1.h b/arch/arm/mach-imx/devices-imx1.h index da593657ff3f..3aad1e70de96 100644 --- a/arch/arm/mach-imx/devices-imx1.h +++ b/arch/arm/mach-imx/devices-imx1.h | |||
| @@ -9,21 +9,21 @@ | |||
| 9 | #include <mach/mx1.h> | 9 | #include <mach/mx1.h> |
| 10 | #include <mach/devices-common.h> | 10 | #include <mach/devices-common.h> |
| 11 | 11 | ||
| 12 | extern const struct imx_imx_fb_data imx1_imx_fb_data __initconst; | 12 | extern const struct imx_imx_fb_data imx1_imx_fb_data; |
| 13 | #define imx1_add_imx_fb(pdata) \ | 13 | #define imx1_add_imx_fb(pdata) \ |
| 14 | imx_add_imx_fb(&imx1_imx_fb_data, pdata) | 14 | imx_add_imx_fb(&imx1_imx_fb_data, pdata) |
| 15 | 15 | ||
| 16 | extern const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst; | 16 | extern const struct imx_imx_i2c_data imx1_imx_i2c_data; |
| 17 | #define imx1_add_imx_i2c(pdata) \ | 17 | #define imx1_add_imx_i2c(pdata) \ |
| 18 | imx_add_imx_i2c(&imx1_imx_i2c_data, pdata) | 18 | imx_add_imx_i2c(&imx1_imx_i2c_data, pdata) |
| 19 | 19 | ||
| 20 | extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[] __initconst; | 20 | extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[]; |
| 21 | #define imx1_add_imx_uart(id, pdata) \ | 21 | #define imx1_add_imx_uart(id, pdata) \ |
| 22 | imx_add_imx_uart_3irq(&imx1_imx_uart_data[id], pdata) | 22 | imx_add_imx_uart_3irq(&imx1_imx_uart_data[id], pdata) |
| 23 | #define imx1_add_imx_uart0(pdata) imx1_add_imx_uart(0, pdata) | 23 | #define imx1_add_imx_uart0(pdata) imx1_add_imx_uart(0, pdata) |
| 24 | #define imx1_add_imx_uart1(pdata) imx1_add_imx_uart(1, pdata) | 24 | #define imx1_add_imx_uart1(pdata) imx1_add_imx_uart(1, pdata) |
| 25 | 25 | ||
| 26 | extern const struct imx_spi_imx_data imx1_cspi_data[] __initconst; | 26 | extern const struct imx_spi_imx_data imx1_cspi_data[]; |
| 27 | #define imx1_add_cspi(id, pdata) \ | 27 | #define imx1_add_cspi(id, pdata) \ |
| 28 | imx_add_spi_imx(&imx1_cspi_data[id], pdata) | 28 | imx_add_spi_imx(&imx1_cspi_data[id], pdata) |
| 29 | 29 | ||