diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /include/asm-mips/mach-rc32434/irq.h | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/asm-mips/mach-rc32434/irq.h')
| -rw-r--r-- | include/asm-mips/mach-rc32434/irq.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-mips/mach-rc32434/irq.h b/include/asm-mips/mach-rc32434/irq.h deleted file mode 100644 index cb9e4725f5dc..000000000000 --- a/include/asm-mips/mach-rc32434/irq.h +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | #ifndef __ASM_RC32434_IRQ_H | ||
| 2 | #define __ASM_RC32434_IRQ_H | ||
| 3 | |||
| 4 | #define NR_IRQS 256 | ||
| 5 | |||
| 6 | #include <asm/mach-generic/irq.h> | ||
| 7 | |||
| 8 | #endif /* __ASM_RC32434_IRQ_H */ | ||