diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-03 22:56:17 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-03 22:56:17 -0400 |
| commit | 701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb (patch) | |
| tree | c07aa954f48ec45c422641052d46008697a4a6b1 /arch/arm/mach-shmobile/include/mach/irqs.h | |
| parent | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/configs/ap4evb_defconfig
arch/arm/configs/g3evm_defconfig
arch/arm/configs/g4evm_defconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/irqs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/irqs.h b/arch/arm/mach-shmobile/include/mach/irqs.h index e881797648a9..fa15b5f8a001 100644 --- a/arch/arm/mach-shmobile/include/mach/irqs.h +++ b/arch/arm/mach-shmobile/include/mach/irqs.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define __ASM_MACH_IRQS_H | 2 | #define __ASM_MACH_IRQS_H |
| 3 | 3 | ||
| 4 | #define NR_IRQS 512 | 4 | #define NR_IRQS 512 |
| 5 | #define NR_IRQS_LEGACY 8 | ||
| 6 | 5 | ||
| 7 | /* INTCA */ | 6 | /* INTCA */ |
| 8 | #define evt2irq(evt) (((evt) >> 5) - 16) | 7 | #define evt2irq(evt) (((evt) >> 5) - 16) |