diff --git a/[refs] b/[refs] index d0bbc8985db5..c2b70243c287 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc0ccfceb8aa6800040ba4f37a36ee306aa71c9f +refs/heads/master: b1413357d924792e2e332dcb6b712a7fb2a5fb25 diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index 1e6fec487973..3d94a1471724 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -8,6 +8,9 @@ menu "Graphics support" config HAVE_FB_ATMEL bool +config HAVE_FB_IMX + bool + source "drivers/char/agp/Kconfig" source "drivers/gpu/vga/Kconfig" @@ -400,9 +403,6 @@ 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 && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)