diff --git a/[refs] b/[refs]
index d98316031955..897158bb60bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8049966b7f903ce61e94efbbddf581cf8860b85
+refs/heads/master: 933b2a1d8d458d6fe12b5efd63a0432852c44d6d
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
index cb1dd356b278..abcd82bfcb9a 100644
--- a/trunk/arch/sparc/Kconfig
+++ b/trunk/arch/sparc/Kconfig
@@ -235,9 +235,6 @@ source "drivers/pci/Kconfig"
 
 endif
 
-config NO_DMA
-	def_bool !PCI
-
 config SUN_OPENPROMFS
 	tristate "Openprom tree appears in /proc/openprom"
 	help