diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
| commit | d1a020050c6ce1a0794ff73582ccf47e4db536f7 (patch) | |
| tree | 1b7250410f24703cd77c76156e758db9887137aa /drivers/video/carminefb.c | |
| parent | ALSA: rename "Device" to "Toshiba SB-0500" via quirks (diff) | |
| parent | ALSA: usb-audio - Cache mixer values (diff) | |
| download | linux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.tar.xz linux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.zip | |
Merge branch 'topic/usb-mixer-cache' into next/usb-audio
Diffstat (limited to 'drivers/video/carminefb.c')
| -rw-r--r-- | drivers/video/carminefb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c index c9b191319a9a..c7ff3c1a266a 100644 --- 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; } |