From a15cc32a8ca4ab940cc9680dd63f91e5c563e90a Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Tue, 6 Jan 2009 14:42:30 -0800
Subject: [PATCH] --- yaml --- r: 126383 b: refs/heads/master c:
 08cc6341cc04fad45c28995db796317b5b413045 h: refs/heads/master i:   126381:
 114175e5464e836a856ca21be03039d9aa2b4a61   126379:
 2dd7f5abb5d853fac6c75a7ccc70371bc8f25c9a   126375:
 1d300b7bfb29920e1926aedc1bbe405646fbf8d6   126367:
 60dda7472b4cc5b02213626f6dccfdfcd8d9feb3 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/video/carminefb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 }