Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[pandora-kernel.git] / arch / mips / tx4938 / common / setup.c

diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c
index be3b88d..3ba4101 100644 (file)
--- a/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@ -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>