diff --git a/[refs] b/[refs]
index 50a0777324c5..5bbabc439d25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f0f598a0069d1ab072375965a4b69137233169c
+refs/heads/master: 66359f849074c55fb80d15235ea5b99f1918663c
diff --git a/trunk/drivers/parport/Kconfig b/trunk/drivers/parport/Kconfig
index 209b4a464bcf..855f389eea40 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
+		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN
 	---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