projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[powerpc.git]
/
include
/
asm-mips
/
bitops.h
diff --git
a/include/asm-mips/bitops.h
b/include/asm-mips/bitops.h
index
d2f4445
..
1bb89c5
100644
(file)
--- a/
include/asm-mips/bitops.h
+++ b/
include/asm-mips/bitops.h
@@
-9,7
+9,6
@@
#ifndef _ASM_BITOPS_H
#define _ASM_BITOPS_H
#ifndef _ASM_BITOPS_H
#define _ASM_BITOPS_H
-#include <linux/config.h>
#include <linux/compiler.h>
#include <linux/types.h>
#include <asm/bug.h>
#include <linux/compiler.h>
#include <linux/types.h>
#include <asm/bug.h>
@@
-32,7
+31,7
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <
asm/interrupt
.h>
+#include <
linux/irqflags
.h>
#include <asm/sgidefs.h>
#include <asm/war.h>
#include <asm/sgidefs.h>
#include <asm/war.h>