Merge branch 'tip/sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...

[~andy/linux] / include / asm-generic / bitops / atomic.h

diff --git a/include/asm-generic/bitops/atomic.h b/include/asm-generic/bitops/atomic.h
index ecc44a8e2b4466fbbf86b5a1e374ae15b2ef50aa..9ae6c34dc191e73adc4b6402618a05dae773f243 100644 (file)
--- a/include/asm-generic/bitops/atomic.h
+++ b/include/asm-generic/bitops/atomic.h
@@ -2,7 +2,7 @@
 #define _ASM_GENERIC_BITOPS_ATOMIC_H_
 
 #include <asm/types.h>
-#include <asm/system.h>
+#include <linux/irqflags.h>
 
 #ifdef CONFIG_SMP
 #include <asm/spinlock.h>