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-pca100.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-pca100.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 8c720d44602a..39c580bc9225 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
@@ -172,7 +172,6 @@ pca100_nand_board_info __initconst = { | |||
172 | }; | 172 | }; |
173 | 173 | ||
174 | static struct platform_device *platform_devices[] __initdata = { | 174 | static struct platform_device *platform_devices[] __initdata = { |
175 | &mxc_w1_master_device, | ||
176 | &mxc_wdt, | 175 | &mxc_wdt, |
177 | }; | 176 | }; |
178 | 177 | ||
@@ -434,6 +433,7 @@ static void __init pca100_init(void) | |||
434 | 433 | ||
435 | imx27_add_fec(NULL); | 434 | imx27_add_fec(NULL); |
436 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 435 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
436 | imx27_add_mxc_w1(NULL); | ||
437 | } | 437 | } |
438 | 438 | ||
439 | static void __init pca100_timer_init(void) | 439 | static void __init pca100_timer_init(void) |