diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 14:18:11 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 14:18:11 +0000 |
| commit | fd775c084ee55c046548616ca6b510c46d29f208 (patch) | |
| tree | 36791c2b682950e7594747d12c44e30beb91a826 /arch/arm/mach-mx2/devices.c | |
| parent | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel (diff) | |
| parent | imxfb: Fix TFT mode (diff) | |
| download | linux-dev-fd775c084ee55c046548616ca6b510c46d29f208.tar.xz linux-dev-fd775c084ee55c046548616ca6b510c46d29f208.zip | |
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 = { .resource = mxc_nand_resources, }; -#ifdef CONFIG_FB_IMX /* * lcdc: * - i.MX1: the basic controller @@ -259,7 +258,6 @@ struct platform_device mxc_fb_device = { .coherent_dma_mask = 0xFFFFFFFF, }, }; -#endif #ifdef CONFIG_MACH_MX27 static struct resource mxc_fec_resources[] = { |