Index: src/synch/spinlock.c
===================================================================
--- src/synch/spinlock.c	(revision 43114c515872442297f5b1b8a327743ef24c825a)
+++ src/synch/spinlock.c	(revision 992bbb973fb33c1a5240dfc3591c3fa04a139966)
@@ -29,8 +29,5 @@
 #include <arch.h>
 
-#ifdef __SMP__
-#include <arch/smp/atomic.h>
-#endif
-
+#include <arch/atomic.h>
 #include <synch/spinlock.h>