git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
video
/
logo
/
Kconfig
diff --git
a/drivers/video/logo/Kconfig
b/drivers/video/logo/Kconfig
index
9397bce
..
39ac49e
100644
(file)
--- a/
drivers/video/logo/Kconfig
+++ b/
drivers/video/logo/Kconfig
@@
-10,6
+10,11
@@
menuconfig LOGO
if LOGO
if LOGO
+config FB_LOGO_EXTRA
+ bool
+ depends on FB=y
+ default y if SPU_BASE
+
config LOGO_LINUX_MONO
bool "Standard black and white Linux logo"
default y
config LOGO_LINUX_MONO
bool "Standard black and white Linux logo"
default y
@@
-22,6
+27,16
@@
config LOGO_LINUX_CLUT224
bool "Standard 224-color Linux logo"
default y
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
config LOGO_DEC_CLUT224
bool "224-color Digital Equipment Corporation Linux logo"
depends on MACH_DECSTATION || ALPHA