diff --git a/[refs] b/[refs]
index d697bcb926cb..66401a1bf7d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ec26db1f8cae0aca64708e0fe1f687eab7c82e5
+refs/heads/master: 6cc4abe43e9362034881ad8c005f4ab8a684ae3e
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index 64990592dc58..cc59c52e1103 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/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)) {