Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[sfrench/cifs-2.6.git] / arch / mips / tx4938 / common / setup.c
index be3b88dd4c1fbee4a23fcd0ac7ca3b1fe660a760..3ba4101d141eda4360f6a438cf2fafbcb5572553 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/irq.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>