diff --git a/[refs] b/[refs]
index 4919577b26ea..ccf98ebdc7fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 348738afe530cc3a7306bbd3d1ccd322f9638f32
+refs/heads/master: e1a8b69afd63f26f8e7be39e3bc78c4894cdb9fd
diff --git a/trunk/arch/sparc/include/asm/atomic_32.h b/trunk/arch/sparc/include/asm/atomic_32.h
index 534832f5b353..03fd0c520962 100644
--- a/trunk/arch/sparc/include/asm/atomic_32.h
+++ b/trunk/arch/sparc/include/asm/atomic_32.h
@@ -13,8 +13,6 @@
 
 #include <linux/types.h>
 
-#ifdef __KERNEL__
-
 #include <asm/system.h>
 
 #define ATOMIC_INIT(i)  { (i) }
@@ -58,6 +56,4 @@ extern void atomic_set(atomic_t *, int);
 #define smp_mb__before_atomic_inc()	barrier()
 #define smp_mb__after_atomic_inc()	barrier()
 
-#endif /* !(__KERNEL__) */
-
 #endif /* !(__ARCH_SPARC_ATOMIC__) */