diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 15:00:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 15:00:08 -0700 |
| commit | 7e568e62e9d4674d487cdc11f369e49e56ce6703 (patch) | |
| tree | 3d9c1c04341ccadb5d4b9c73eda50b62f0f103b3 /arch/arm/mach-s3c2410/irq.c | |
| parent | adb2705a89e8b41abcf29c0ed86f4ce93ab36734 (diff) | |
| parent | 50273978975ee62938b7ca612e281927cd789c13 (diff) | |
| download | kernel_samsung_smdk4412-7e568e62e9d4674d487cdc11f369e49e56ce6703.zip kernel_samsung_smdk4412-7e568e62e9d4674d487cdc11f369e49e56ce6703.tar.gz kernel_samsung_smdk4412-7e568e62e9d4674d487cdc11f369e49e56ce6703.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-s3c2410/irq.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/irq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c index b668c48..cf9f46d 100644 --- a/arch/arm/mach-s3c2410/irq.c +++ b/arch/arm/mach-s3c2410/irq.c @@ -40,8 +40,11 @@ * 04-Nov-2004 Ben Dooks * Fix standard IRQ wake for EINT0..4 and RTC * - * 22-Feb-2004 Ben Dooks + * 22-Feb-2005 Ben Dooks * Fixed edge-triggering on ADC IRQ + * + * 28-Jun-2005 Ben Dooks + * Mark IRQ_LCD valid */ #include <linux/init.h> @@ -366,7 +369,6 @@ static struct irqchip s3c_irq_eint0t4 = { #define INTMSK_UART1 (1UL << (IRQ_UART1 - IRQ_EINT0)) #define INTMSK_UART2 (1UL << (IRQ_UART2 - IRQ_EINT0)) #define INTMSK_ADCPARENT (1UL << (IRQ_ADCPARENT - IRQ_EINT0)) -#define INTMSK_LCD (1UL << (IRQ_LCD - IRQ_EINT0)) static inline void s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit, @@ -716,7 +718,6 @@ void __init s3c24xx_init_irq(void) case IRQ_UART0: case IRQ_UART1: case IRQ_UART2: - case IRQ_LCD: case IRQ_ADCPARENT: set_irq_chip(irqno, &s3c_irq_level_chip); set_irq_handler(irqno, do_level_IRQ); |