diff --git a/[refs] b/[refs]
index aff686055af7..bd8f1c235825 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb9a63a1e550c489ba389c53bef0f7a94156fa8e
+refs/heads/master: 715ec944f6a04e1ee3b6ae335e5071e0b2a7755c
diff --git a/trunk/drivers/parport/Kconfig b/trunk/drivers/parport/Kconfig
index d92185a5523b..4b6e4e7aca8f 100644
--- a/trunk/drivers/parport/Kconfig
+++ b/trunk/drivers/parport/Kconfig
@@ -36,7 +36,7 @@ if PARPORT
 config PARPORT_PC
 	tristate "PC-style hardware"
 	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && \
-		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN
+		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && !XTENSA
 	---help---
 	  You should say Y here if you have a PC-style parallel port. All
 	  IBM PC compatible computers and some Alphas have PC-style