nokia_rx51: disable obsolete VIDEO config

Disable VIDEO config to fix DM_VIDEO conversion
deadline warning.

Signed-off-by: Anatolij Gustschin <agust@denx.de>

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index e249dff7747471ecb4c6e0cd3e10f1cd08cfad82..b0a58e52538044fa37cae5402028a66f5085ff8a 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -54,7 +54,7 @@ CONFIG_USB_MUSB_HCD=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y
 CONFIG_TWL4030_USB=y
-CONFIG_VIDEO=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
 # CONFIG_VGA_AS_SINGLE_DEVICE is not set
 CONFIG_SPLASH_SCREEN=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2f3bb4b0853c6ee3dae798675e5ba2ae3b98abae..998271b9b628ce6fcd8123b72ba96fd1f89975a0 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -665,7 +665,7 @@ config VIDEO
 
 config CFB_CONSOLE
        bool "Enable colour frame buffer console"
-       depends on VIDEO
+       depends on VIDEO || ARCH_OMAP2PLUS
        default y if VIDEO
        help
          Enables the colour frame buffer driver. This supports colour