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-pcm038.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-pcm038.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 2cfc4b96c503..3c9f2df89269 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -173,7 +173,6 @@ pcm038_nand_board_info __initconst = { | |||
173 | static struct platform_device *platform_devices[] __initdata = { | 173 | static struct platform_device *platform_devices[] __initdata = { |
174 | &pcm038_nor_mtd_device, | 174 | &pcm038_nor_mtd_device, |
175 | &pcm038_sram_mtd_device, | 175 | &pcm038_sram_mtd_device, |
176 | &mxc_wdt, | ||
177 | }; | 176 | }; |
178 | 177 | ||
179 | /* On pcm038 there's a sram attached to CS1, we enable the chipselect here and | 178 | /* On pcm038 there's a sram attached to CS1, we enable the chipselect here and |
@@ -325,6 +324,7 @@ static void __init pcm038_init(void) | |||
325 | 324 | ||
326 | imx27_add_fec(NULL); | 325 | imx27_add_fec(NULL); |
327 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 326 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
327 | imx27_add_imx2_wdt(NULL); | ||
328 | imx27_add_mxc_w1(NULL); | 328 | imx27_add_mxc_w1(NULL); |
329 | 329 | ||
330 | #ifdef CONFIG_MACH_PCM970_BASEBOARD | 330 | #ifdef CONFIG_MACH_PCM970_BASEBOARD |