Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / include / asm-sparc64 / smp.h

diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h
index 42c09949526cd53f3b259b4912463a77851edbee..1c1c5ea5cea5dea69e40cf4c4a96932f4d24d58b 100644 (file)
--- a/include/asm-sparc64/smp.h
+++ b/include/asm-sparc64/smp.h
@@ -26,7 +26,7 @@
  *     Private routines/data
  */
  
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/atomic.h>
 #include <asm/percpu.h>