diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-10-29 04:56:07 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 02:58:13 -0500 |
commit | ae71a5622253708aa08df231e6415fe7a1e96b10 (patch) | |
tree | 4ff6463e9ab3392af9aa5aeb5b0016ec02da2bdb /arch/arm/mach-imx/mach-pcm038.c | |
parent | d96801b2ca47cfeddadede7a1998e1fe0eab095c (diff) |
ARM: imx: dynamically allocate mxc_w1 devices
Currently there is no platform data used in the driver. In case this
changes 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 49a97ce07426..2cfc4b96c503 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -172,7 +172,6 @@ pcm038_nand_board_info __initconst = { | |||
172 | 172 | ||
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 | &mxc_w1_master_device, | ||
176 | &pcm038_sram_mtd_device, | 175 | &pcm038_sram_mtd_device, |
177 | &mxc_wdt, | 176 | &mxc_wdt, |
178 | }; | 177 | }; |
@@ -326,6 +325,7 @@ static void __init pcm038_init(void) | |||
326 | 325 | ||
327 | imx27_add_fec(NULL); | 326 | imx27_add_fec(NULL); |
328 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 327 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
328 | imx27_add_mxc_w1(NULL); | ||
329 | 329 | ||
330 | #ifdef CONFIG_MACH_PCM970_BASEBOARD | 330 | #ifdef CONFIG_MACH_PCM970_BASEBOARD |
331 | pcm970_baseboard_init(); | 331 | pcm970_baseboard_init(); |