diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-11-11 21:45:57 +0800 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2008-11-11 21:45:57 +0800 |
commit | 1ec26db1f8cae0aca64708e0fe1f687eab7c82e5 (patch) | |
tree | 438ad8222fbf763f8e51ba4227206e1de137e2a9 | |
parent | 3ad4f597058301c97f362e500a32f63f5c950a45 (diff) | |
download | op-kernel-dev-1ec26db1f8cae0aca64708e0fe1f687eab7c82e5.zip op-kernel-dev-1ec26db1f8cae0aca64708e0fe1f687eab7c82e5.tar.gz |
pxafb: introduce LCD_TYPE_MASK and use it.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxafb.h | 1 | ||||
-rw-r--r-- | drivers/video/pxafb.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h index 8e59111..cbda4d3 100644 --- a/arch/arm/mach-pxa/include/mach/pxafb.h +++ b/arch/arm/mach-pxa/include/mach/pxafb.h @@ -33,6 +33,7 @@ #define LCD_CONN_TYPE(_x) ((_x) & 0x0f) #define LCD_CONN_WIDTH(_x) (((_x) >> 4) & 0x1f) +#define LCD_TYPE_MASK 0xf #define LCD_TYPE_UNKNOWN 0 #define LCD_TYPE_MONO_STN 1 #define LCD_TYPE_MONO_DSTN 2 diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 9720449..6499059 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -1372,7 +1372,7 @@ static void pxafb_decode_mach_info(struct pxafb_info *fbi, fbi->cmap_inverse = inf->cmap_inverse; fbi->cmap_static = inf->cmap_static; - switch (lcd_conn & 0xf) { + switch (lcd_conn & LCD_TYPE_MASK) { case LCD_TYPE_MONO_STN: fbi->lccr0 = LCCR0_CMS; break; |