diff --git a/[refs] b/[refs]
index b1217bcceb7f..90368e0cbd48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab17da5cb9d4aaf9f04c706761d3a8024897bedd
+refs/heads/master: aea1181b0bd0a09c54546399768f359d1e198e45
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
index f92602e86607..27060b20678e 100644
--- a/trunk/arch/sparc/Kconfig
+++ b/trunk/arch/sparc/Kconfig
@@ -31,6 +31,7 @@ config SPARC
 
 config SPARC32
 	def_bool !64BIT
+	select GENERIC_ATOMIC64
 
 config SPARC64
 	def_bool 64BIT
diff --git a/trunk/arch/sparc/include/asm/atomic_32.h b/trunk/arch/sparc/include/asm/atomic_32.h
index 03fd0c520962..9dd0a769fa18 100644
--- a/trunk/arch/sparc/include/asm/atomic_32.h
+++ b/trunk/arch/sparc/include/asm/atomic_32.h
@@ -13,6 +13,8 @@
 
 #include <linux/types.h>
 
+#include <asm-generic/atomic64.h>
+
 #include <asm/system.h>
 
 #define ATOMIC_INIT(i)  { (i) }