diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-22 04:09:14 -0400 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 03:00:50 -0400 |
| commit | 06606ff1300ecb05a2a2953c9f735730950365f5 (patch) | |
| tree | c34e823648d219d5f6288f68a50804cafe0f13f8 /arch/arm/mach-mx3/devices.c | |
| parent | 7536cf992f395cb431f723041183d14a91d89c84 (diff) | |
ARM: imx: dynamically register spi_imx devices (imx31)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/devices.c')
| -rw-r--r-- | arch/arm/mach-mx3/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index a285b1660c8c..02d05ea7036c 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c | |||
| @@ -379,6 +379,7 @@ struct platform_device mxc_usbh2 = { | |||
| 379 | .num_resources = ARRAY_SIZE(mxc_usbh2_resources), | 379 | .num_resources = ARRAY_SIZE(mxc_usbh2_resources), |
| 380 | }; | 380 | }; |
| 381 | 381 | ||
| 382 | #if defined(CONFIG_ARCH_MX35) | ||
| 382 | /* | 383 | /* |
| 383 | * SPI master controller | 384 | * SPI master controller |
| 384 | * 3 channels | 385 | * 3 channels |
| @@ -440,7 +441,6 @@ struct platform_device mxc_spi_device2 = { | |||
| 440 | .resource = mxc_spi_2_resources, | 441 | .resource = mxc_spi_2_resources, |
| 441 | }; | 442 | }; |
| 442 | 443 | ||
| 443 | #ifdef CONFIG_ARCH_MX35 | ||
| 444 | static struct resource mxc_fec_resources[] = { | 444 | static struct resource mxc_fec_resources[] = { |
| 445 | { | 445 | { |
| 446 | .start = MXC_FEC_BASE_ADDR, | 446 | .start = MXC_FEC_BASE_ADDR, |