From 3d44a1e2e1ca01d116c1e346e2e86a5c471d56da Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Thu, 10 Apr 2008 06:34:29 +0100 Subject: [PATCH] --- yaml --- r: 91252 b: refs/heads/master c: 64c1dd3bbf67c958992c098d5d464a014df3fa46 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-pxa/pxa-regs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8f1fb58fd81b..9a4ba4ff6778 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60802188ece1c5b63deefc05b7b442625e575476 +refs/heads/master: 64c1dd3bbf67c958992c098d5d464a014df3fa46 diff --git a/trunk/include/asm-arm/arch-pxa/pxa-regs.h b/trunk/include/asm-arm/arch-pxa/pxa-regs.h index c28c5eaf04ac..a322012f16ac 100644 --- a/trunk/include/asm-arm/arch-pxa/pxa-regs.h +++ b/trunk/include/asm-arm/arch-pxa/pxa-regs.h @@ -1635,7 +1635,7 @@ #define CICR0_FOM (1 << 0) /* FIFO-overrun mask */ #define CICR1_TBIT (1 << 31) /* Transparency bit */ -#define CICR1_RGBT_CONV (0x3 << 30) /* RGBT conversion mask */ +#define CICR1_RGBT_CONV (0x3 << 29) /* RGBT conversion mask */ #define CICR1_PPL (0x7ff << 15) /* Pixels per line mask */ #define CICR1_RGB_CONV (0x7 << 12) /* RGB conversion mask */ #define CICR1_RGB_F (1 << 11) /* RGB format */