From a113ead2a295489315de20cf858582eaa48cad5a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 17 Feb 2010 12:33:23 +0200 Subject: [PATCH] --- yaml --- r: 187593 b: refs/heads/master c: f601441916d1e19291d0b4f044b4a7551e2924d0 h: refs/heads/master i: 187591: 72b239fd751557797e50e3d31b14009907ec7e4e v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/Kconfig | 1 + trunk/drivers/video/Kconfig | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2788f1caf60a..7a0910e8bb84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94d32f99c6aba8b702a9cf78cb328aeb7882b1e5 +refs/heads/master: f601441916d1e19291d0b4f044b4a7551e2924d0 diff --git a/trunk/arch/arm/plat-mxc/Kconfig b/trunk/arch/arm/plat-mxc/Kconfig index cea51a0ae9f7..cdee9176a775 100644 --- a/trunk/arch/arm/plat-mxc/Kconfig +++ b/trunk/arch/arm/plat-mxc/Kconfig @@ -24,6 +24,7 @@ config ARCH_MX25 bool "MX25-based" select CPU_ARM926T select COMMON_CLKDEV + select HAVE_FB_IMX help This enables support for systems based on the Freescale i.MX25 family diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index 5a5c303a6373..83d40ed2f2d6 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -400,9 +400,12 @@ config FB_SA1100 If you plan to use the LCD display with your SA-1100 system, say Y here. +config HAVE_FB_IMX + bool + config FB_IMX tristate "Motorola i.MX LCD support" - depends on FB && (ARCH_MX1 || ARCH_MX2) + depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT