diff --git a/[refs] b/[refs]
index e875450f78c7..74e1f2df7798 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc65d90fcffe82f516ce5c9e1b8423841868d035
+refs/heads/master: cf2d3ff994f19151fb9200c94c24daaed82700a2
diff --git a/trunk/drivers/parport/Kconfig b/trunk/drivers/parport/Kconfig
index b7bcdcc5c724..209b4a464bcf 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
+		(!M68K || ISA) && !MN10300 && !AVR32
 	---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