diff --git a/[refs] b/[refs]
index 5a0368bddad8..09898093b71f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 574047f96a302cbca2f9bfafd78b1869b6a900bf
+refs/heads/master: cb47729bdaf49fe5e9dd2c41554f44a77b5cd590
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index e7aa7ae8fca8..bef35afa258d 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -1031,7 +1031,9 @@ static void pxafb_setup_gpio(struct pxafb_info *fbi)
 	pxa_gpio_mode(GPIO74_LCD_FCLK_MD);
 	pxa_gpio_mode(GPIO75_LCD_LCLK_MD);
 	pxa_gpio_mode(GPIO76_LCD_PCLK_MD);
-	pxa_gpio_mode(GPIO77_LCD_ACBIAS_MD);
+
+	if ((lccr0 & LCCR0_PAS) == 0)
+		pxa_gpio_mode(GPIO77_LCD_ACBIAS_MD);
 }
 
 static void pxafb_enable_controller(struct pxafb_info *fbi)