diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-01-30 08:07:14 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-01-30 08:07:14 -0500 |
commit | 1d7180e24e22a608cc4d7e8fd425a19a9394a7ed (patch) | |
tree | bd747993fe7943d0f28578e371f426e4f6227ad3 /arch/arm/mach-imx/devices/platform-imx-uart.c | |
parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) | |
parent | 7356420cd34e40fe27bf26555b0bf3f2849a43dd (diff) |
Merge tag 'imx-cleanup-3.9' into imx6q-cpuidle
Diffstat (limited to 'arch/arm/mach-imx/devices/platform-imx-uart.c')
-rw-r--r-- | arch/arm/mach-imx/devices/platform-imx-uart.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-imx/devices/platform-imx-uart.c b/arch/arm/mach-imx/devices/platform-imx-uart.c index 67bf866a2cb6..faac4aa6ca6d 100644 --- a/arch/arm/mach-imx/devices/platform-imx-uart.c +++ b/arch/arm/mach-imx/devices/platform-imx-uart.c | |||
@@ -94,18 +94,6 @@ const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst = { | |||
94 | }; | 94 | }; |
95 | #endif /* ifdef CONFIG_SOC_IMX35 */ | 95 | #endif /* ifdef CONFIG_SOC_IMX35 */ |
96 | 96 | ||
97 | #ifdef CONFIG_SOC_IMX50 | ||
98 | const struct imx_imx_uart_1irq_data imx50_imx_uart_data[] __initconst = { | ||
99 | #define imx50_imx_uart_data_entry(_id, _hwid) \ | ||
100 | imx_imx_uart_1irq_data_entry(MX50, _id, _hwid, SZ_4K) | ||
101 | imx50_imx_uart_data_entry(0, 1), | ||
102 | imx50_imx_uart_data_entry(1, 2), | ||
103 | imx50_imx_uart_data_entry(2, 3), | ||
104 | imx50_imx_uart_data_entry(3, 4), | ||
105 | imx50_imx_uart_data_entry(4, 5), | ||
106 | }; | ||
107 | #endif /* ifdef CONFIG_SOC_IMX50 */ | ||
108 | |||
109 | #ifdef CONFIG_SOC_IMX51 | 97 | #ifdef CONFIG_SOC_IMX51 |
110 | const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = { | 98 | const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = { |
111 | #define imx51_imx_uart_data_entry(_id, _hwid) \ | 99 | #define imx51_imx_uart_data_entry(_id, _hwid) \ |