diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 12:28:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 12:28:35 -0400 |
| commit | abfd3057187812352cd8502c29ca50cd010b3ccc (patch) | |
| tree | c84ff2b16ba38351f5ff461b74d97fe33f1e83c0 /include | |
| parent | 96b8eaa14a20771997b501a049e418b871bf9def (diff) | |
| parent | 913ed41eb5c948d2f8b5deffd29c2638eceef3d7 (diff) | |
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.h | 1 |
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 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/compiler.h> | 12 | #include <linux/compiler.h> |
| 13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 14 | #include <asm/bitops.h> | ||
| 15 | #include <asm/intrinsics.h> | 14 | #include <asm/intrinsics.h> |
| 16 | 15 | ||
| 17 | /** | 16 | /** |