summaryrefslogtreecommitdiff
path: root/include/asm-mips/mach-rc32434/irq.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-10-20 06:17:52 +0400
committerPaul Mundt <lethal@linux-sh.org>2008-10-20 06:17:52 +0400
commit4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch)
treedb3d7519932549bf528f5b8e4cb8350356cd544d /include/asm-mips/mach-rc32434/irq.h
parent79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac (diff)
parent0cfd81031a26717fe14380d18275f8e217571615 (diff)
downloadlinux-4cb40f795af36b3deb743f6ccf6c3fd542c61c8d.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: Documentation/kernel-parameters.txt arch/sh/include/asm/elf.h
Diffstat (limited to 'include/asm-mips/mach-rc32434/irq.h')
-rw-r--r--include/asm-mips/mach-rc32434/irq.h8
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 @@
-#ifndef __ASM_RC32434_IRQ_H
-#define __ASM_RC32434_IRQ_H
-
-#define NR_IRQS 256
-
-#include <asm/mach-generic/irq.h>
-
-#endif /* __ASM_RC32434_IRQ_H */