diff --git a/[refs] b/[refs]
index 4be5d7727c17..b68f4fdf39ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a838e543db8f65ccbc710548916f20c23e51a363
+refs/heads/master: 84b6a2323a2b9482958965bc66bbfbd2711cde71
diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig
index b9378c72a2f5..d5797618a3b9 100644
--- a/trunk/drivers/serial/Kconfig
+++ b/trunk/drivers/serial/Kconfig
@@ -211,7 +211,7 @@ comment "Non-8250 serial port support"
 
 config SERIAL_AMBA_PL010
 	tristate "ARM AMBA PL010 serial port support"
-	depends on ARM_AMBA
+	depends on ARM_AMBA && (BROKEN || !ARCH_VERSATILE)
 	select SERIAL_CORE
 	help
 	  This selects the ARM(R) AMBA(R) PrimeCell PL010 UART.  If you have