Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[linux-2.6-omap-h63xx.git] / drivers / video / logo / Kconfig

diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 9de1c114f8092f095832ab520f01c48ce058f2ec..39ac49e0682ced1eef75c5e0b31426e4efe26975 100644 (file)
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -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