From dbfb8f72a550f065587b9cee27c381d2bc336dfa Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 3 Oct 2012 13:13:27 +0000 Subject: [PATCH] --- yaml --- r: 333300 b: refs/heads/master c: ec8e8208acb88d81dde2727b0ac06d06728bf963 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-footbridge/include/mach/irqs.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a5570b36d2cb..2a574608077d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f90cce5a9b0ecf3cc6d3d3046cbfc19fc957dcb +refs/heads/master: ec8e8208acb88d81dde2727b0ac06d06728bf963 diff --git a/trunk/arch/arm/mach-footbridge/include/mach/irqs.h b/trunk/arch/arm/mach-footbridge/include/mach/irqs.h index 400551e43e4e..61c714c4920e 100644 --- a/trunk/arch/arm/mach-footbridge/include/mach/irqs.h +++ b/trunk/arch/arm/mach-footbridge/include/mach/irqs.h @@ -89,8 +89,6 @@ #define IRQ_NETWINDER_VGA _ISA_IRQ(11) #define IRQ_NETWINDER_SOUND _ISA_IRQ(12) -#undef RTC_IRQ -#define RTC_IRQ IRQ_ISA_RTC_ALARM #define I8042_KBD_IRQ IRQ_ISA_KEYBOARD #define I8042_AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE) #define IRQ_FLOPPYDISK IRQ_ISA_FLOPPY