2 files changed, 18 insertions, 7 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index bc9a12be1e33..d9aed1033442 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -7,6 +7,10 @@ menu "Graphics support"
 source "drivers/video/backlight/Kconfig"
 source "drivers/video/display/Kconfig"
 
+config VGASTATE
+       tristate
+       default n
+
 config FB
         tristate "Support for frame buffer devices"
         ---help---
@@ -481,6 +485,7 @@ config FB_VGA16
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select VGASTATE
         help
           This is the frame buffer device driver for VGA 16 color graphic
           cards. Say Y if you have such a card.
@@ -716,6 +721,7 @@ config FB_NVIDIA
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         select BITREVERSE
+        select VGASTATE
         help
           This driver supports graphics boards with the nVidia chips, TNT
           and newer. For very old chipsets, such as the RIVA128, then use
@@ -754,6 +760,7 @@ config FB_RIVA
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         select BITREVERSE
+        select VGASTATE
         help
           This driver supports graphics boards with the nVidia Riva/Geforce
           chips.
@@ -800,6 +807,7 @@ config FB_I810
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select VGASTATE
         help
           This driver supports the on-board graphics built in to the Intel 810 
           and 815 chipsets.  Say Y if you have and plan to use such a board.
@@ -1150,6 +1158,7 @@ config FB_S3
         select FB_CFB_IMAGEBLIT
         select FB_TILEBLITTING
         select FB_SVGALIB
+        select VGASTATE
         ---help---
           Driver for graphics boards with S3 Trio / S3 Virge chip.
 
@@ -1160,6 +1169,7 @@ config FB_SAVAGE
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select VGASTATE
         help
           This driver supports notebooks and computers with S3 Savage PCI/AGP
           chips.
@@ -1226,6 +1236,7 @@ config FB_NEOMAGIC
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select VGASTATE
         help
           This driver supports notebooks with NeoMagic PCI chips.
           Say Y if you have such a graphics card. 
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 1e1845d7ecce..cd94375c3fc1 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -4,6 +4,7 @@
 
 # Each configuration option enables a list of files.
 
+obj-$(CONFIG_VGASTATE)            += vgastate.o
 obj-y                             += fb_notify.o
 obj-$(CONFIG_FB)                  += fb.o
 fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
@@ -31,18 +32,17 @@ obj-$(CONFIG_FB_PM2)              += pm2fb.o
 obj-$(CONFIG_FB_PM3)              += pm3fb.o
 
 obj-$(CONFIG_FB_MATROX)           += matrox/
-obj-$(CONFIG_FB_RIVA)             += riva/ vgastate.o
-obj-$(CONFIG_FB_NVIDIA)           += nvidia/ vgastate.o
+obj-$(CONFIG_FB_RIVA)             += riva/
+obj-$(CONFIG_FB_NVIDIA)           += nvidia/
 obj-$(CONFIG_FB_ATY)              += aty/ macmodes.o
 obj-$(CONFIG_FB_ATY128)           += aty/ macmodes.o
 obj-$(CONFIG_FB_RADEON)           += aty/
 obj-$(CONFIG_FB_SIS)              += sis/
 obj-$(CONFIG_FB_KYRO)             += kyro/
-obj-$(CONFIG_FB_SAVAGE)           += savage/ vgastate.o
+obj-$(CONFIG_FB_SAVAGE)           += savage/
 obj-$(CONFIG_FB_GEODE)            += geode/
 obj-$(CONFIG_FB_MBX)              += mbx/
-obj-$(CONFIG_FB_I810)             += vgastate.o
-obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o vgastate.o
+obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o
 obj-$(CONFIG_FB_3DFX)             += tdfxfb.o
 obj-$(CONFIG_FB_CONTROL)          += controlfb.o
 obj-$(CONFIG_FB_PLATINUM)         += platinumfb.o
@@ -52,7 +52,7 @@ obj-$(CONFIG_FB_IMSTT)            += imsttfb.o
 obj-$(CONFIG_FB_FM2)              += fm2fb.o
 obj-$(CONFIG_FB_CYBLA)            += cyblafb.o
 obj-$(CONFIG_FB_TRIDENT)          += tridentfb.o
-obj-$(CONFIG_FB_S3)               += s3fb.o vgastate.o
+obj-$(CONFIG_FB_S3)               += s3fb.o
 obj-$(CONFIG_FB_STI)              += stifb.o
 obj-$(CONFIG_FB_FFB)              += ffb.o sbuslib.o
 obj-$(CONFIG_FB_CG6)              += cg6.o sbuslib.o
@@ -108,7 +108,7 @@ obj-$(CONFIG_FB_SM501)            += sm501fb.o
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_VESA)             += vesafb.o
 obj-$(CONFIG_FB_IMAC)             += imacfb.o
-obj-$(CONFIG_FB_VGA16)            += vga16fb.o vgastate.o
+obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
 
 # the test framebuffer is last