1 files changed, 16 insertions, 18 deletions

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index d9ffb13cc87a..cba0d13c7d31 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -2,6 +2,18 @@
 # 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
         tristate "Support for frame buffer devices"
         select FB_CMDLINE
@@ -54,12 +66,6 @@ config FIRMWARE_EDID
          combination with certain motherboards and monitors are known to
          suffer from this problem.
 
-config FB_CMDLINE
-        bool
-
-config FB_NOTIFY
-        bool
-
 config FB_DDC
        tristate
        depends on FB
@@ -329,12 +335,6 @@ config FB_ACORN
           hardware found in Acorn RISC PCs and other ARM-based machines.  If
           unsure, say N.
 
-config FB_CLPS711X_OLD
-        tristate
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-
 config FB_CLPS711X
         tristate "CLPS711X LCD support"
         depends on FB && (ARCH_CLPS711X || COMPILE_TEST)
@@ -1456,7 +1456,6 @@ if FB_VIA
 
 config FB_VIA_DIRECT_PROCFS
         bool "direct hardware access via procfs (DEPRECATED)(DANGEROUS)"
-        depends on FB_VIA
         default n
         help
           Allow direct hardware access to some output registers via procfs.
@@ -1466,7 +1465,6 @@ config FB_VIA_DIRECT_PROCFS
 
 config FB_VIA_X_COMPATIBILITY
         bool "X server compatibility"
-        depends on FB_VIA
         default n
         help
           This option reduces the functionality (power saving, ...) of the
@@ -2308,10 +2306,6 @@ config FB_SIMPLE
           Configuration re: surface address, size, and format must be provided
           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
         tristate "Solomon SSD1307 framebuffer support"
         depends on FB && I2C
@@ -2341,3 +2335,7 @@ config FB_SM712
           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
           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"