Merge bk://kernel.bkbits.net/davem/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
7b0f9236 · Linus Torvalds · 4ec3792a · 55a92a2b · 7b0f9236
Commit 7b0f9236 authored Jun 06, 2004 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/video/sbuslib.c drivers/video/sbuslib.c +1 -0

No files found.
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -122,6 +122,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
 		cmap.red = &red;
 		cmap.green = &green;
 		cmap.blue = &blue;
+		cmap.transp = NULL;
 		for (i = 0; i < count; i++) {
 			int err;