diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-30 09:56:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-30 09:56:44 +0200 |
| commit | 3ca50496c2677a2b3fdd3ede86660fd1433beac6 (patch) | |
| tree | 97a76d8479a8d8a96e04ed0694b8dbf89457bfcc /arch/arm/plat-omap/include/plat/irqs.h | |
| parent | 462b04e28a7ec1339c892117c3f20a40e55d0e83 (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into perf/core
Merge reason: update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/irqs.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/irqs.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index b65088a869e..401701977db 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -345,8 +345,6 @@ #define INT_34XX_MMC3_IRQ 94 #define INT_34XX_GPT12_IRQ 95 -#define INT_34XX_BENCH_MPU_EMUL 3 - #define INT_35XX_HECC0_IRQ 24 #define INT_35XX_HECC1_IRQ 28 #define INT_35XX_EMAC_C0_RXTHRESH_IRQ 67 |