Merge branch 'akpm' (incoming from Andrew)

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e7068c5..80cbd21 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -364,7 +364,7 @@ config FB_SA1100
          Y here.
 
 config FB_IMX
-       tristate "Freescale i.MX LCD support"
+       tristate "Freescale i.MX1/21/25/27 LCD support"
        depends on FB && IMX_HAVE_PLATFORM_IMX_FB
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
@@ -1112,8 +1112,8 @@ config FB_RIVA_BACKLIGHT
          Say Y here if you want to control the backlight of your display.
 
 config FB_I740
-       tristate "Intel740 support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && FB && PCI
+       tristate "Intel740 support"
+       depends on FB && PCI
        select FB_MODE_HELPERS
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
@@ -1124,8 +1124,8 @@ config FB_I740
          This driver supports graphics cards based on Intel740 chip.
 
 config FB_I810
-       tristate "Intel 810/815 support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL
+       tristate "Intel 810/815 support"
+       depends on FB && PCI && X86_32 && AGP_INTEL
        select FB_MODE_HELPERS
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
@@ -1187,8 +1187,8 @@ config FB_CARILLO_RANCH
          This driver supports the LE80578 (Carillo Ranch) board
 
 config FB_INTEL
-       tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EXPERT
+       tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support"
+       depends on FB && PCI && X86 && AGP_INTEL && EXPERT
        select FB_MODE_HELPERS
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
@@ -1432,7 +1432,7 @@ config FB_ATY_CT
          is at <http://support.ati.com/products/pc/mach64/mach64.html>.
 
 config FB_ATY_GENERIC_LCD
-       bool "Mach64 generic LCD support (EXPERIMENTAL)"
+       bool "Mach64 generic LCD support"
        depends on FB_ATY_CT
        help
          Say Y if you have a laptop with an ATI Rage LT PRO, Rage Mobility,
@@ -1479,7 +1479,7 @@ config FB_S3_DDC
 
 config FB_SAVAGE
        tristate "S3 Savage support"
-       depends on FB && PCI && EXPERIMENTAL
+       depends on FB && PCI
        select FB_MODE_HELPERS
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
@@ -1633,15 +1633,15 @@ config FB_3DFX
          module will be called tdfxfb.
 
 config FB_3DFX_ACCEL
-       bool "3Dfx Acceleration functions (EXPERIMENTAL)"
-       depends on FB_3DFX && EXPERIMENTAL
+       bool "3Dfx Acceleration functions"
+       depends on FB_3DFX
        ---help---
        This will compile the 3Dfx Banshee/Voodoo3/VSA-100 frame buffer
        device driver with acceleration functions.
 
 config FB_3DFX_I2C
        bool "Enable DDC/I2C support"
-       depends on FB_3DFX && EXPERIMENTAL
+       depends on FB_3DFX
        select FB_DDC
        default y
        help
@@ -1714,8 +1714,8 @@ config FB_ARK
          and ICS 5342 RAMDAC.
 
 config FB_PM3
-       tristate "Permedia3 support (EXPERIMENTAL)"
-       depends on FB && PCI && EXPERIMENTAL
+       tristate "Permedia3 support"
+       depends on FB && PCI
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -2025,7 +2025,8 @@ config FB_TMIO_ACCELL
 
 config FB_S3C
        tristate "Samsung S3C framebuffer support"
-       depends on FB && (S3C_DEV_FB || S5P_DEV_FIMD0)
+       depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || ARCH_S5P64X0 || \
+               ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -2183,6 +2184,15 @@ config FB_XILINX
          framebuffer. ML300 carries a 640*480 LCD display on the board,
          ML403 uses a standard DB15 VGA connector.
 
+config FB_GOLDFISH
+       tristate "Goldfish Framebuffer"
+       depends on FB
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       ---help---
+         Framebuffer driver for Goldfish Virtual Platform
+
 config FB_COBALT
        tristate "Cobalt server LCD frame buffer support"
        depends on FB && (MIPS_COBALT || MIPS_SEAD3)
@@ -2422,6 +2432,7 @@ config FB_PUV3_UNIGFX
 source "drivers/video/omap/Kconfig"
 source "drivers/video/omap2/Kconfig"
 source "drivers/video/exynos/Kconfig"
+source "drivers/video/mmp/Kconfig"
 source "drivers/video/backlight/Kconfig"
 
 if VT