diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-04 05:09:10 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 04:01:25 -0500 |
commit | e0a1961df8ad898b661cf0adcf3519254f135a44 (patch) | |
tree | bc663100b851b8cf06157fa6a967393bef39a8a9 /arch/arm/mach-imx/mach-cpuimx27.c | |
parent | b2997cb12b302ee6d233808e32214d00afdcf128 (diff) |
ARM: imx: dynamically allocate imx2-wdt devices
Currently there is no platform data used in the driver. In case this
changes and for consistency NULL is passed unused to the soc specific
functions.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx27.c')
-rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 9baaf3df048e..5771d4e58879 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
@@ -157,7 +157,6 @@ cpuimx27_nand_board_info __initconst = { | |||
157 | 157 | ||
158 | static struct platform_device *platform_devices[] __initdata = { | 158 | static struct platform_device *platform_devices[] __initdata = { |
159 | &eukrea_cpuimx27_nor_mtd_device, | 159 | &eukrea_cpuimx27_nor_mtd_device, |
160 | &mxc_wdt, | ||
161 | }; | 160 | }; |
162 | 161 | ||
163 | static const struct imxi2c_platform_data cpuimx27_i2c1_data __initconst = { | 162 | static const struct imxi2c_platform_data cpuimx27_i2c1_data __initconst = { |
@@ -261,6 +260,7 @@ static void __init eukrea_cpuimx27_init(void) | |||
261 | 260 | ||
262 | imx27_add_fec(NULL); | 261 | imx27_add_fec(NULL); |
263 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 262 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
263 | imx27_add_imx2_wdt(NULL); | ||
264 | imx27_add_mxc_w1(NULL); | 264 | imx27_add_mxc_w1(NULL); |
265 | 265 | ||
266 | #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2) | 266 | #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2) |