diff --git a/[refs] b/[refs]
index eeecd75c4da1..021710fc2e98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 004ea683d96ff51131789e78a3de7dafcdbf912d
+refs/heads/master: 7ff86b0317bc40c665aab62f3b7669713ade07c5
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 5e2185432ad3..06b72771ae22 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -113,7 +113,7 @@ config PPC
 	select HAVE_KPROBES
 	select HAVE_KRETPROBES
 	select HAVE_LMB
-	select HAVE_DMA_ATTRS
+	select HAVE_DMA_ATTRS if PPC64
 
 config EARLY_PRINTK
 	bool