Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / include / asm-sh / irq-sh7780.h

diff --git a/include/asm-sh/irq-sh7780.h b/include/asm-sh/irq-sh7780.h
index 8c8ca12..895c578 100644 (file)
--- a/include/asm-sh/irq-sh7780.h
+++ b/include/asm-sh/irq-sh7780.h
@@ -145,11 +145,6 @@
 #define        TMU_CH5_IPR_POS         1
 #define TMU_CH5_PRIORITY       2
 
-#define        RTC_IRQ         22
-#define        RTC_IPR_ADDR    INTC_INT2PRI1
-#define        RTC_IPR_POS     0
-#define        RTC_PRIORITY    TIMER_PRIORITY
-
 /* SCIF0 */
 #define SCIF0_ERI_IRQ  40
 #define SCIF0_RXI_IRQ  41
@@ -299,29 +294,6 @@
 #define        GPIO_IPR_POS    2
 #define        GPIO_PRIORITY   3
 
-/* ONCHIP_NR_IRQS */
-#define NR_IRQS 150    /* 111 + 16 */
-
-/* In a generic kernel, NR_IRQS is an upper bound, and we should use
- * ACTUAL_NR_IRQS (which uses the machine vector) to get the correct value.
- */
-#define ACTUAL_NR_IRQS NR_IRQS
-
-extern void disable_irq(unsigned int);
-extern void disable_irq_nosync(unsigned int);
-extern void enable_irq(unsigned int);
-
-/*
- * Simple Mask Register Support
- */
-extern void make_maskreg_irq(unsigned int irq);
-extern unsigned short *irq_mask_register;
-
-/*
- * Function for "on chip support modules".
- */
-extern void make_imask_irq(unsigned int irq);
-
 #define        INTC_TMU0_MSK   0
 #define        INTC_TMU3_MSK   1
 #define        INTC_RTC_MSK    2