Commit aae3394e authored by Randy Dunlap's avatar Randy Dunlap Committed by Bartlomiej Zolnierkiewicz

fbdev: fix broken menu dependencies

The framebuffer options and devices menu is unintentionally split
or broken because some items in it do not depend on FB (including
several under omap and mmp).
Fix this by moving FB_CMDLINE, FB_NOTIFY, and FB_CLPS711X_OLD to
just before the FB Kconfig symbol definition and by moving the
omap, omap2, and mmp menus to last, following FB_SM712.

Also, the FB_VIA dependencies are duplicated by both being inside
an "if FB_VIA/endif" block and "depends on FB_VIA", so drop the
"depends on FB_VIA" lines since they are redundant.

Fixes: ea6763c1 ("video/fbdev: Always built-in video= cmdline parsing")
Fixes: 5ec96538 ("fbdev: Make fb-notify a no-op if CONFIG_FB=n")
Fixes: ef74d46a ("video: clps711x: Add new Cirrus Logic CLPS711X framebuffer driver")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 864eb1af
...@@ -2,6 +2,18 @@ ...@@ -2,6 +2,18 @@
# fbdev configuration # fbdev configuration
# #
config FB_CMDLINE
bool
config FB_NOTIFY
bool
config FB_CLPS711X_OLD
tristate
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
menuconfig FB menuconfig FB
tristate "Support for frame buffer devices" tristate "Support for frame buffer devices"
select FB_CMDLINE select FB_CMDLINE
...@@ -54,12 +66,6 @@ config FIRMWARE_EDID ...@@ -54,12 +66,6 @@ config FIRMWARE_EDID
combination with certain motherboards and monitors are known to combination with certain motherboards and monitors are known to
suffer from this problem. suffer from this problem.
config FB_CMDLINE
bool
config FB_NOTIFY
bool
config FB_DDC config FB_DDC
tristate tristate
depends on FB depends on FB
...@@ -329,12 +335,6 @@ config FB_ACORN ...@@ -329,12 +335,6 @@ config FB_ACORN
hardware found in Acorn RISC PCs and other ARM-based machines. If hardware found in Acorn RISC PCs and other ARM-based machines. If
unsure, say N. unsure, say N.
config FB_CLPS711X_OLD
tristate
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
config FB_CLPS711X config FB_CLPS711X
tristate "CLPS711X LCD support" tristate "CLPS711X LCD support"
depends on FB && (ARCH_CLPS711X || COMPILE_TEST) depends on FB && (ARCH_CLPS711X || COMPILE_TEST)
...@@ -1456,7 +1456,6 @@ if FB_VIA ...@@ -1456,7 +1456,6 @@ if FB_VIA
config FB_VIA_DIRECT_PROCFS config FB_VIA_DIRECT_PROCFS
bool "direct hardware access via procfs (DEPRECATED)(DANGEROUS)" bool "direct hardware access via procfs (DEPRECATED)(DANGEROUS)"
depends on FB_VIA
default n default n
help help
Allow direct hardware access to some output registers via procfs. Allow direct hardware access to some output registers via procfs.
...@@ -1466,7 +1465,6 @@ config FB_VIA_DIRECT_PROCFS ...@@ -1466,7 +1465,6 @@ config FB_VIA_DIRECT_PROCFS
config FB_VIA_X_COMPATIBILITY config FB_VIA_X_COMPATIBILITY
bool "X server compatibility" bool "X server compatibility"
depends on FB_VIA
default n default n
help help
This option reduces the functionality (power saving, ...) of the This option reduces the functionality (power saving, ...) of the
...@@ -2308,10 +2306,6 @@ config FB_SIMPLE ...@@ -2308,10 +2306,6 @@ config FB_SIMPLE
Configuration re: surface address, size, and format must be provided Configuration re: surface address, size, and format must be provided
through device tree, or plain old platform data. through device tree, or plain old platform data.
source "drivers/video/fbdev/omap/Kconfig"
source "drivers/video/fbdev/omap2/Kconfig"
source "drivers/video/fbdev/mmp/Kconfig"
config FB_SSD1307 config FB_SSD1307
tristate "Solomon SSD1307 framebuffer support" tristate "Solomon SSD1307 framebuffer support"
depends on FB && I2C depends on FB && I2C
...@@ -2341,3 +2335,7 @@ config FB_SM712 ...@@ -2341,3 +2335,7 @@ config FB_SM712
This driver is also available as a module. The module will be This driver is also available as a module. The module will be
called sm712fb. If you want to compile it as a module, say M called sm712fb. If you want to compile it as a module, say M
here and read <file:Documentation/kbuild/modules.txt>. here and read <file:Documentation/kbuild/modules.txt>.
source "drivers/video/fbdev/omap/Kconfig"
source "drivers/video/fbdev/omap2/Kconfig"
source "drivers/video/fbdev/mmp/Kconfig"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment