diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-25 14:46:48 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-27 09:51:13 -0400 |
commit | 0412d6c9271811b84568fcea3237e2193e21866a (patch) | |
tree | cef432fe03bc7c086314b8c083ced338e2181f45 | |
parent | 542f869f1826f092606efd0c4c771f070d1314f5 (diff) |
i.MX1: remove fb support from mach-imx
The lack of an include file currently breaks compilation of
mx1ads_defconfig. As framebuffer support is not actively used for
mach-imx and the whole architecture will be replaced by mach-mx1
soon, just remove fb support.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/mach-imx/generic.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c index 887cb21f75b0..05f1739ee127 100644 --- a/arch/arm/mach-imx/generic.c +++ b/arch/arm/mach-imx/generic.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
30 | 30 | ||
31 | #include <asm/errno.h> | 31 | #include <asm/errno.h> |
32 | #include <mach/imxfb.h> | ||
33 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
34 | #include <mach/imx-regs.h> | 33 | #include <mach/imx-regs.h> |
35 | 34 | ||
@@ -245,43 +244,8 @@ void __init imx_set_mmc_info(struct imxmmc_platform_data *info) | |||
245 | imx_mmc_device.dev.platform_data = info; | 244 | imx_mmc_device.dev.platform_data = info; |
246 | } | 245 | } |
247 | 246 | ||
248 | static struct imx_fb_platform_data imx_fb_info; | ||
249 | |||
250 | void __init set_imx_fb_info(struct imx_fb_platform_data *hard_imx_fb_info) | ||
251 | { | ||
252 | memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imx_fb_platform_data)); | ||
253 | } | ||
254 | |||
255 | static struct resource imxfb_resources[] = { | ||
256 | [0] = { | ||
257 | .start = 0x00205000, | ||
258 | .end = 0x002050FF, | ||
259 | .flags = IORESOURCE_MEM, | ||
260 | }, | ||
261 | [1] = { | ||
262 | .start = LCDC_INT, | ||
263 | .end = LCDC_INT, | ||
264 | .flags = IORESOURCE_IRQ, | ||
265 | }, | ||
266 | }; | ||
267 | |||
268 | static u64 fb_dma_mask = ~(u64)0; | ||
269 | |||
270 | static struct platform_device imxfb_device = { | ||
271 | .name = "imx-fb", | ||
272 | .id = 0, | ||
273 | .dev = { | ||
274 | .platform_data = &imx_fb_info, | ||
275 | .dma_mask = &fb_dma_mask, | ||
276 | .coherent_dma_mask = 0xffffffff, | ||
277 | }, | ||
278 | .num_resources = ARRAY_SIZE(imxfb_resources), | ||
279 | .resource = imxfb_resources, | ||
280 | }; | ||
281 | |||
282 | static struct platform_device *devices[] __initdata = { | 247 | static struct platform_device *devices[] __initdata = { |
283 | &imx_mmc_device, | 248 | &imx_mmc_device, |
284 | &imxfb_device, | ||
285 | }; | 249 | }; |
286 | 250 | ||
287 | static struct map_desc imx_io_desc[] __initdata = { | 251 | static struct map_desc imx_io_desc[] __initdata = { |