Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / include / asm-sparc / atomic.h

diff --git a/include/asm-sparc/atomic.h b/include/asm-sparc/atomic.h
index e1033170bd3ad89dcb473f76ebd9f636641cb57a..731fa56e0c374c8413c41c8460f16f4844d7046b 100644 (file)
--- a/include/asm-sparc/atomic.h
+++ b/include/asm-sparc/atomic.h
@@ -10,7 +10,6 @@
 #ifndef __ARCH_SPARC_ATOMIC__
 #define __ARCH_SPARC_ATOMIC__
 
-#include <linux/config.h>
 
 typedef struct { volatile int counter; } atomic_t;