Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / video / carminefb.c

diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
index c9b191319a9a6ca7cdd047d52fd5e38918db6176..c7ff3c1a266a3611c2081e71e56bbb29264eaa0b 100644 (file)
--- a/drivers/video/carminefb.c
+++ b/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;
 }