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
2006-05-08 09:28:35 -07:00
parent 96b8eaa14a 913ed41eb5
commit abfd305718
2 changed files with 6 additions and 4 deletions
@@ -11,7 +11,6 @@

 #include <linux/compiler.h>
 #include <linux/types.h>
-#include <asm/bitops.h>
 #include <asm/intrinsics.h>

 /**