diff --git a/[refs] b/[refs]
index 4de4d57a479a..bb8eaffc8b5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab62c1e1dae0dedfc300c9f8e5c74227a8e26665
+refs/heads/master: 14d891d20374c139acfaa379e61a7091b00df8fa
diff --git a/trunk/drivers/parport/Kconfig b/trunk/drivers/parport/Kconfig
index 16a2e6ae37f4..725a14119f2a 100644
--- a/trunk/drivers/parport/Kconfig
+++ b/trunk/drivers/parport/Kconfig
@@ -34,7 +34,7 @@ config PARPORT
 
 config PARPORT_PC
 	tristate "PC-style hardware"
-	depends on PARPORT && (!SPARC64 || PCI) && !SPARC32
+	depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R
 	---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