diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-03 08:25:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 08:25:59 +0100 |
| commit | 6083aa485c86933ee444dc2242270d37ea4664cb (patch) | |
| tree | e2b7b9588bbf18a62bf08fcf3fda812de25cda4d /drivers | |
| parent | dcb7731a185efbf3d800618d874af99895df5afb (diff) | |
| parent | 93093d099e5dd0c258fd530c12668e828c20df41 (diff) | |
| download | kernel-crypto-6083aa485c86933ee444dc2242270d37ea4664cb.tar.gz kernel-crypto-6083aa485c86933ee444dc2242270d37ea4664cb.tar.xz kernel-crypto-6083aa485c86933ee444dc2242270d37ea4664cb.zip | |
Merge branch 'x86/io' into x86/iommu
Merge x86/io into x86/iommu due to a small patch conflict in io.h.
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 97204497d9f..cc59c52e110 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; |