diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 10:50:11 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 10:50:11 +1100 |
commit | f851013cb2238a82782da03ac82a14447933f90d (patch) | |
tree | f97835f69d244865c4a5397d0e6d45d1276a919d /arch/arm/mach-shmobile/include/mach/sh73a0.h | |
parent | f2699491e06584a2ebb0939f108ad29f3b151456 (diff) | |
parent | 203738e548cefc3fc3c2f73a9063176c9f3583d5 (diff) | |
download | linux-f851013cb2238a82782da03ac82a14447933f90d.tar.gz linux-f851013cb2238a82782da03ac82a14447933f90d.tar.bz2 linux-f851013cb2238a82782da03ac82a14447933f90d.zip |
Merge remote-tracking branch 'origin/master' into next
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/sh73a0.h')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/sh73a0.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h index 881d515a9686..cad57578ceed 100644 --- a/arch/arm/mach-shmobile/include/mach/sh73a0.h +++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h @@ -515,8 +515,8 @@ enum { SHDMA_SLAVE_MMCIF_RX, }; -/* PINT interrupts are located at Linux IRQ 768 and up */ -#define SH73A0_PINT0_IRQ(irq) ((irq) + 768) -#define SH73A0_PINT1_IRQ(irq) ((irq) + 800) +/* PINT interrupts are located at Linux IRQ 800 and up */ +#define SH73A0_PINT0_IRQ(irq) ((irq) + 800) +#define SH73A0_PINT1_IRQ(irq) ((irq) + 832) #endif /* __ASM_SH73A0_H__ */ |