Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / arch / arm / mach-shark / include / mach / irqs.h

diff --git a/arch/arm/mach-shark/include/mach/irqs.h b/arch/arm/mach-shark/include/mach/irqs.h
index 0586acd7cdd5f563ba178cdb0421d290d9de04ac..c8e8a4e1f61ae2292c64ac1e4c55af9716632504 100644 (file)
--- a/arch/arm/mach-shark/include/mach/irqs.h
+++ b/arch/arm/mach-shark/include/mach/irqs.h
@@ -7,7 +7,7 @@
 #define NR_IRQS                        16
 
 #define IRQ_ISA_KEYBOARD        1
-#define RTC_IRQ                         8
+#define IRQ_ISA_RTC_ALARM       8
 #define I8042_KBD_IRQ           1
 #define I8042_AUX_IRQ          12
 #define IRQ_HARDDISK            14