diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-15 09:28:45 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 15:54:36 -0500 |
commit | 742269e2d971957c84f364c4e9f5c6439964ef01 (patch) | |
tree | bebc9ea6b88df9424494000316e5b0c1098becdb /arch/arm/mach-mx3/mach-pcm037.c | |
parent | 2d58de2805f93bdb8fa0608d98e1871bb28ec091 (diff) |
ARM: mx3: dynamically allocate imx2-wdt devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm037.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index 2d297436820..cb657692b80 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c | |||
@@ -440,7 +440,6 @@ static int __init pcm037_camera_alloc_dma(const size_t buf_size) | |||
440 | static struct platform_device *devices[] __initdata = { | 440 | static struct platform_device *devices[] __initdata = { |
441 | &pcm037_flash, | 441 | &pcm037_flash, |
442 | &pcm037_sram_device, | 442 | &pcm037_sram_device, |
443 | &imx_wdt_device0, | ||
444 | &pcm037_mt9t031, | 443 | &pcm037_mt9t031, |
445 | &pcm037_mt9v022, | 444 | &pcm037_mt9v022, |
446 | }; | 445 | }; |
@@ -606,6 +605,7 @@ static void __init mxc_board_init(void) | |||
606 | 605 | ||
607 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 606 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
608 | 607 | ||
608 | imx31_add_imx2_wdt(NULL); | ||
609 | imx31_add_imx_uart0(&uart_pdata); | 609 | imx31_add_imx_uart0(&uart_pdata); |
610 | /* XXX: should't this have .flags = 0 (i.e. no RTSCTS) on PCM037_EET? */ | 610 | /* XXX: should't this have .flags = 0 (i.e. no RTSCTS) on PCM037_EET? */ |
611 | imx31_add_imx_uart1(&uart_pdata); | 611 | imx31_add_imx_uart1(&uart_pdata); |