diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 10:18:11 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 10:18:11 -0400 |
| commit | fd775c084ee55c046548616ca6b510c46d29f208 (patch) | |
| tree | 36791c2b682950e7594747d12c44e30beb91a826 /arch/arm/mach-mx2/devices.c | |
| parent | dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a (diff) | |
| parent | 4d1e4e5a6387aad97590e2da9c6db1350f22f63a (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-mx2/devices.c')
| -rw-r--r-- | arch/arm/mach-mx2/devices.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c index f81aa8a8fbb4..a0f1b3674327 100644 --- a/arch/arm/mach-mx2/devices.c +++ b/arch/arm/mach-mx2/devices.c | |||
| @@ -229,7 +229,6 @@ struct platform_device mxc_nand_device = { | |||
| 229 | .resource = mxc_nand_resources, | 229 | .resource = mxc_nand_resources, |
| 230 | }; | 230 | }; |
| 231 | 231 | ||
| 232 | #ifdef CONFIG_FB_IMX | ||
| 233 | /* | 232 | /* |
| 234 | * lcdc: | 233 | * lcdc: |
| 235 | * - i.MX1: the basic controller | 234 | * - i.MX1: the basic controller |
| @@ -259,7 +258,6 @@ struct platform_device mxc_fb_device = { | |||
| 259 | .coherent_dma_mask = 0xFFFFFFFF, | 258 | .coherent_dma_mask = 0xFFFFFFFF, |
| 260 | }, | 259 | }, |
| 261 | }; | 260 | }; |
| 262 | #endif | ||
| 263 | 261 | ||
| 264 | #ifdef CONFIG_MACH_MX27 | 262 | #ifdef CONFIG_MACH_MX27 |
| 265 | static struct resource mxc_fec_resources[] = { | 263 | static struct resource mxc_fec_resources[] = { |