Commit 7b0f9236 authored by Linus Torvalds's avatar Linus Torvalds

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

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 4ec3792a 55a92a2b
...@@ -122,6 +122,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, ...@@ -122,6 +122,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
cmap.red = &red; cmap.red = &red;
cmap.green = &green; cmap.green = &green;
cmap.blue = &blue; cmap.blue = &blue;
cmap.transp = NULL;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int err; int err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment