summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-08 09:28:35 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-08 09:28:35 -0700
commitabfd3057187812352cd8502c29ca50cd010b3ccc (patch)
treec84ff2b16ba38351f5ff461b74d97fe33f1e83c0 /include
parent96b8eaa14a20771997b501a049e418b871bf9def (diff)
parent913ed41eb5c948d2f8b5deffd29c2638eceef3d7 (diff)
downloadlinux-abfd3057187812352cd8502c29ca50cd010b3ccc.tar.gz
linux-abfd3057187812352cd8502c29ca50cd010b3ccc.tar.bz2
linux-abfd3057187812352cd8502c29ca50cd010b3ccc.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] remove asm-ia64/bitops.h self-inclusion [IA64] strcpy returns NULL pointer and not destination pointer
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/bitops.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ia64/bitops.h b/include/asm-ia64/bitops.h
index 90921e162793..6cc517e212a9 100644
--- 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>
/**