diff --git a/[refs] b/[refs]
index c68e9499bfcf..02b33fac2403 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6002db8287cdf9a8497aa345be2d27936a3b6a52
+refs/heads/master: e7a05aa9e697ff6fc165d45671cdcca601942f62
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
index 55b629a2326e..a576dc261732 100644
--- a/trunk/drivers/video/Kconfig
+++ b/trunk/drivers/video/Kconfig
@@ -580,7 +580,7 @@ config FB_VGA16
 
 config FB_BF54X_LQ043
 	tristate "SHARP LQ043 TFT LCD (BF548 EZKIT)"
-	depends on FB && (BF54x)
+	depends on FB && (BF54x) && !BF542
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT