Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / include / asm-ia64 / bitops.h

diff --git a/include/asm-ia64/bitops.h b/include/asm-ia64/bitops.h
index 90921e162793e22f4861e78ebda066d971c4fbc0..6cc517e212a92ee94e461c2e1944f3fe9af0c627 100644 (file)
--- a/include/asm-ia64/bitops.h
+++ b/include/asm-ia64/bitops.h
@@ -11,7 +11,6 @@
 
 #include <linux/compiler.h>
 #include <linux/types.h>
-#include <asm/bitops.h>
 #include <asm/intrinsics.h>
 
 /**