diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/asm-mips/mach-mips | |
| parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/asm-mips/mach-mips')
| -rw-r--r-- | include/asm-mips/mach-mips/cpu-feature-overrides.h | 1 | ||||
| -rw-r--r-- | include/asm-mips/mach-mips/irq.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-mips/mach-mips/cpu-feature-overrides.h b/include/asm-mips/mach-mips/cpu-feature-overrides.h index 12c937283bb4..e960679f54ba 100644 --- a/include/asm-mips/mach-mips/cpu-feature-overrides.h +++ b/include/asm-mips/mach-mips/cpu-feature-overrides.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H | 9 | #ifndef __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H |
| 10 | #define __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H | 10 | #define __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* | 13 | /* |
| 15 | * CPU feature overrides for MIPS boards | 14 | * CPU feature overrides for MIPS boards |
diff --git a/include/asm-mips/mach-mips/irq.h b/include/asm-mips/mach-mips/irq.h index f8579696ca54..083d9c512a04 100644 --- a/include/asm-mips/mach-mips/irq.h +++ b/include/asm-mips/mach-mips/irq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_MACH_MIPS_IRQ_H | 1 | #ifndef __ASM_MACH_MIPS_IRQ_H |
| 2 | #define __ASM_MACH_MIPS_IRQ_H | 2 | #define __ASM_MACH_MIPS_IRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #define NR_IRQS 256 | 5 | #define NR_IRQS 256 |
| 7 | 6 | ||