diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /include/asm-mips/bitops.h | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'include/asm-mips/bitops.h')
| -rw-r--r-- | include/asm-mips/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index 098cec263681..1bb89c5a10ee 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | #ifdef __KERNEL__ | 32 | #ifdef __KERNEL__ |
| 33 | 33 | ||
| 34 | #include <asm/interrupt.h> | 34 | #include <linux/irqflags.h> |
| 35 | #include <asm/sgidefs.h> | 35 | #include <asm/sgidefs.h> |
| 36 | #include <asm/war.h> | 36 | #include <asm/war.h> |
| 37 | 37 | ||