Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6

[karo-tx-linux.git] / arch / sparc / lib / bitext.c

diff --git a/arch/sparc/lib/bitext.c b/arch/sparc/lib/bitext.c
index 94b05e8c906c78ca4701ccb766573f01b2798c75..764b3eb7b604ebd7858d1ed02a4609a31f30537b 100644 (file)
--- a/arch/sparc/lib/bitext.c
+++ b/arch/sparc/lib/bitext.c
@@ -9,7 +9,7 @@
  * fragmentation.
  */
 
-#include <linux/smp_lock.h>
+#include <linux/string.h>
 #include <linux/bitops.h>
 
 #include <asm/bitext.h>