diff options
author | Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> | 2010-06-04 17:15:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:21:45 -0400 |
commit | b1413357d924792e2e332dcb6b712a7fb2a5fb25 (patch) | |
tree | 8154ae2efaa79fae84b0b1422be01de793277b04 /drivers/video/Kconfig | |
parent | fc0ccfceb8aa6800040ba4f37a36ee306aa71c9f (diff) |
fbdev: fix frame buffer devices menu
Commit f601441916d1e19291d0b4f044b4a7551e2924d0 ("imxfb: add support for
i.MX25:) has inserted the symbol HAVE_FB_IMX, which does not depend on FB
after the menuconfig FB. This breaks the menu, presenting most of the
drivers outside of it, when using menuconfig.
Moving the symbol to the start of the file, just like HAVE_FB_ATMEL, fixes
the problem without breaking it for iMX25 configurations (tested with
ARCH=arm, no build).
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r-- | drivers/video/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 1e6fec487973..3d94a1471724 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -8,6 +8,9 @@ menu "Graphics support" | |||
8 | config HAVE_FB_ATMEL | 8 | config HAVE_FB_ATMEL |
9 | bool | 9 | bool |
10 | 10 | ||
11 | config HAVE_FB_IMX | ||
12 | bool | ||
13 | |||
11 | source "drivers/char/agp/Kconfig" | 14 | source "drivers/char/agp/Kconfig" |
12 | 15 | ||
13 | source "drivers/gpu/vga/Kconfig" | 16 | source "drivers/gpu/vga/Kconfig" |
@@ -400,9 +403,6 @@ config FB_SA1100 | |||
400 | If you plan to use the LCD display with your SA-1100 system, say | 403 | If you plan to use the LCD display with your SA-1100 system, say |
401 | Y here. | 404 | Y here. |
402 | 405 | ||
403 | config HAVE_FB_IMX | ||
404 | bool | ||
405 | |||
406 | config FB_IMX | 406 | config FB_IMX |
407 | tristate "Motorola i.MX LCD support" | 407 | tristate "Motorola i.MX LCD support" |
408 | depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2) | 408 | depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2) |