diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-17 10:45:03 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-17 10:45:03 +0000 |
commit | 12a8ab152d6b0c9f697d0f2bd423001ed3fd360b (patch) | |
tree | e49bed406111a9ea84d92b415ebf7b1eda5c7b00 /drivers | |
parent | e14c8bf86350f6c39186a139c5c584a6111b2f01 (diff) | |
parent | faf2f0ab13d259f2386d156d24c405ec8cee30ff (diff) | |
download | linux-12a8ab152d6b0c9f697d0f2bd423001ed3fd360b.tar.gz linux-12a8ab152d6b0c9f697d0f2bd423001ed3fd360b.tar.bz2 linux-12a8ab152d6b0c9f697d0f2bd423001ed3fd360b.zip |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/pxafb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 97204497d9f7..cc59c52e1103 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -804,6 +804,9 @@ static int pxafb_smart_thread(void *arg) static int pxafb_smart_init(struct pxafb_info *fbi) { + if (!(fbi->lccr0 | LCCR0_LCDT)) + return 0; + fbi->smart_thread = kthread_run(pxafb_smart_thread, fbi, "lcd_refresh"); if (IS_ERR(fbi->smart_thread)) { @@ -1372,7 +1375,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; |