Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / video / logo / Kconfig

diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index da219c0..bf64787 100644 (file)
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -12,7 +12,7 @@ if LOGO
 
 config FB_LOGO_EXTRA
        bool
-       depends on FB
+       depends on FB=y
        default y if SPU_BASE
 
 config LOGO_LINUX_MONO
@@ -27,6 +27,16 @@ config LOGO_LINUX_CLUT224
        bool "Standard 224-color Linux logo"
        default y
 
+config LOGO_BLACKFIN_VGA16
+       bool "16-colour Blackfin Processor Linux logo"
+       depends on BLACKFIN
+       default y
+
+config LOGO_BLACKFIN_CLUT224
+       bool "224-colour Blackfin Processor Linux logo"
+       depends on BLACKFIN
+       default y
+
 config LOGO_DEC_CLUT224
        bool "224-color Digital Equipment Corporation Linux logo"
        depends on MACH_DECSTATION || ALPHA
@@ -67,6 +77,11 @@ config LOGO_SUPERH_CLUT224
        depends on SUPERH
        default y
 
+config LOGO_PANDORA_CLUT224
+       bool "224-color Pandora Linux logo"
+       depends on MACH_OMAP3_PANDORA
+       default y
+
 config LOGO_M32R_CLUT224
        bool "224-color M32R Linux logo"
        depends on M32R