Geert Uytterhoeven 4fb6de2561 fbdev/logo: check compatibility of main and extra logos ... The code to draw penguin logos always uses some properties of the main logo. This is incorrect if additional logos (CONFIG_FB_LOGO_EXTRA=y) have different types than the main logo, which causes corrupted logo images. http://bugzilla.kernel.org/show_bug.cgi?id=12181 Hence skip additional logos that are not compatible with the main logo. Technically, it's possible to draw multiple logos of different types on truecolor displays, but this would complicate the (already quite complicated) logo drawing code even more. This patch fixes a problem with Debian's linux-image-2.6.26-1-powerpc64 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=508173 Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Cc: Krzysztof Helt <krzysztof.h1@poczta.fm> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2009-01-06 15:59:27 -08:00
..
accessibility
acpi	remove linux/hardirq.h from asm-generic/local.h	2009-01-06 15:59:13 -08:00
amba
ata	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-12-30 17:43:10 -08:00
atm
auxdisplay
base	mm: show node to memory section relationship with symlinks in sysfs	2009-01-06 15:59:00 -08:00
block	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2008-12-30 17:37:25 -08:00
bluetooth
cdrom
char	genrtc: disable genrtc on Blackfin systems	2009-01-06 15:59:23 -08:00
clocksource	Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-02 11:44:09 -08:00
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac
eisa
firewire
firmware	dmi: fix kernel-doc notation	2009-01-06 15:59:19 -08:00
gpio	gpio: pca953x handles more chips, i2c fault codes	2009-01-06 15:59:25 -08:00
gpu	Check fops_get() return value	2009-01-06 15:59:11 -08:00
hid	Merge branch 'upstream-fixes' into for-next	2009-01-04 01:04:09 +01:00
hwmon	ibmpex: add endian annotation to extract_data() helper	2009-01-06 15:59:18 -08:00
i2c	Merge branch 'for-next' of git://git.o-hand.com/linux-mfd	2009-01-05 19:04:09 -08:00
ide	ide-atapi: start dma in a drive-specific way	2009-01-02 16:12:56 +01:00
idle
ieee1394
infiniband	zero i_uid/i_gid on inode allocation	2009-01-05 11:54:28 -05:00
input	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-12-30 17:36:49 -08:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-01-05 18:44:59 -08:00
leds
lguest	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask	2009-01-03 18:53:31 +01:00
macintosh	drivers/macintosh: Add missing of_node_put in therm_adt746x.c	2009-01-06 15:59:18 -08:00
mca
md	dm snapshot: extend exception store functions	2009-01-06 03:05:19 +00:00
media	poll: allow f_op->poll to sleep	2009-01-06 15:59:12 -08:00
memstick
message	i2o: remove extraneous kernel-doc	2009-01-06 15:59:21 -08:00
mfd	mfd: Fix section mismatch in da903x	2009-01-04 15:31:49 +01:00
misc	ioc4: automatically load sgiioc4 subordinate module	2009-01-06 15:59:13 -08:00
mmc	Merge branch 'master' of ../mmc	2008-12-31 19:56:05 +01:00
mtd	Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6	2009-01-02 15:57:26 -08:00
net	igb: fix anoying type mismatch warning on rx/tx queue sizing	2009-01-05 18:47:12 -08:00
nubus
of
oprofile	zero i_uid/i_gid on inode allocation	2009-01-05 11:54:28 -05:00
parisc	Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-02 11:44:09 -08:00
parport
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu	2009-01-03 12:03:52 -08:00
pcmcia
pnp	percpu: fix percpu accessors to potentially !cpu_possible() cpus: pnpbios	2009-01-01 10:12:14 +10:30
power	power_supply: Add Dialog DA9030 battery charger driver	2009-01-04 12:17:41 +01:00
ps3
rapidio
regulator	mfd: Support configurable numbers of DCDCs and ISINKs on WM8350	2009-01-04 12:17:42 +01:00
rtc	drivers/rtc: correct an error test	2009-01-06 15:59:25 -08:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-01-05 18:44:59 -08:00
sbus
scsi	remove ide-scsi	2009-01-02 16:12:51 +01:00
serial	serial_8250: support for Sealevel Systems Model 7803 COMM+8	2009-01-02 10:19:44 -08:00
sh
sn
spi	drivers/spi: move a dereference below a NULL test	2009-01-06 15:59:20 -08:00
ssb
staging
tc
telephony
thermal
uio
usb	add a vfs_fsync helper	2009-01-05 11:54:28 -05:00
uwb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream	2009-01-02 13:17:13 +00:00
video	fbdev/logo: check compatibility of main and extra logos	2009-01-06 15:59:27 -08:00
virtio	virtio: add PCI device release() function	2008-12-30 09:26:10 +10:30
w1
watchdog	[WATCHDOG] Add support for the WM8350 watchdog	2008-12-31 16:12:54 +00:00
xen	Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-02 11:44:09 -08:00
zorro
Kconfig
Makefile