1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index 84ff23208c25..1e7536d9a8fc 100644
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -1,11 +1,10 @@
 config FB_OMAP
         tristate "OMAP frame buffer support (EXPERIMENTAL)"
-        depends on FB && (OMAP2_DSS = "n")
-        depends on ARCH_OMAP1 || ARCH_OMAP2 || ARCH_OMAP3
+        depends on FB
+        depends on ARCH_OMAP1
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select TWL4030_CORE if MACH_OMAP_2430SDP
         help
           Frame buffer driver for OMAP based boards.
 
@@ -23,13 +22,6 @@ config FB_OMAP_LCDC_HWA742
           Say Y here if you want to have support for the external
           Epson HWA742 LCD controller.
 
-config FB_OMAP_LCDC_BLIZZARD
-        bool "Epson Blizzard LCD controller support"
-        depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
-        help
-          Say Y here if you want to have support for the external
-          Epson Blizzard LCD controller.
-
 config FB_OMAP_MANUAL_UPDATE
         bool "Default to manual update mode"
         depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
@@ -49,7 +41,7 @@ config FB_OMAP_LCD_MIPID
 
 config FB_OMAP_BOOTLOADER_INIT
         bool "Check bootloader initialization"
-        depends on FB_OMAP || FB_OMAP2
+        depends on FB_OMAP
         help
           Say Y here if you want to enable checking if the bootloader has
           already initialized the display controller. In this case the
@@ -68,7 +60,7 @@ config FB_OMAP_CONSISTENT_DMA_SIZE
 
 config FB_OMAP_DMA_TUNE
         bool "Set DMA SDRAM access priority high"
-        depends on FB_OMAP && ARCH_OMAP1
+        depends on FB_OMAP
         help
           On systems in which video memory is in system memory
           (SDRAM) this will speed up graphics DMA operations.