Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6

[can-eth-gw-linux.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 20c33c42600a1d1b7e12e770059a5a18d5a9daae..d08d7998a4aae7835c607791b2308d6ed008a797 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2139,21 +2139,6 @@ config FB_UDL
          mplayer -vo fbdev. Supports all USB 2.0 era DisplayLink devices.
          To compile as a module, choose M here: the module name is udlfb.
 
-config FB_PNX4008_DUM
-       tristate "Display Update Module support on Philips PNX4008 board"
-       depends on FB && ARCH_PNX4008
-       ---help---
-         Say Y here to enable support for PNX4008 Display Update Module (DUM)
-
-config FB_PNX4008_DUM_RGB
-       tristate "RGB Framebuffer support on Philips PNX4008 board"
-       depends on FB_PNX4008_DUM
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
-       ---help---
-         Say Y here to enable support for PNX4008 RGB Framebuffer
-
 config FB_IBM_GXT4500
        tristate "Framebuffer support for IBM GXT4500P adaptor"
        depends on FB && PPC