Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-06 06:43:33 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-06 06:43:33 -0700
commit7b0f9236942c0609a752a89f3f02d211c7541d44 (patch)
tree0b80edf34df0a418c4ded98899bd218c2ddf9333
parent4ec3792aed67a88f4b57b69be9e520ab176fdfe0 (diff)
parent55a92a2bbd294863d2b820816ac1cfb40eafddae (diff)
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
-rw-r--r--drivers/video/sbuslib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index a09be527d759..c1ab754d38c6 100644
--- 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;