diff --git a/[refs] b/[refs] index 30b4c530e506..e815ed5f8fcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 729f77bbe515455ac474e6a4a3709858a01ef3da +refs/heads/master: 08cc6341cc04fad45c28995db796317b5b413045 diff --git a/trunk/drivers/video/carminefb.c b/trunk/drivers/video/carminefb.c index c9b191319a9a..c7ff3c1a266a 100644 --- a/trunk/drivers/video/carminefb.c +++ b/trunk/drivers/video/carminefb.c @@ -168,7 +168,7 @@ static int carmine_setcolreg(unsigned regno, unsigned red, unsigned green, blue >>= 8; transp >>= 8; - ((u32 *)info->pseudo_palette)[regno] = be32_to_cpu(transp << 24 | + ((__be32 *)info->pseudo_palette)[regno] = cpu_to_be32(transp << 24 | red << 0 | green << 8 | blue << 16); return 0; }