diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 23:21:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 23:21:23 -0400 |
commit | 1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c (patch) | |
tree | ecfe847dda816361d83b1da6d7213b27721e7fd7 /arch/arm/mach-lh7a40x/irq-lh7a400.c | |
parent | a166222cde740b34d97fe49dca70348197f4534e (diff) | |
parent | e252630f1fd1d14ac4081e566d2f697ae1779215 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3743/1: ARM: OMAP: Fix compile for OMAP
[ARM] 3739/1: genirq updates: irq_chip, add and use irq_chip.name
Diffstat (limited to 'arch/arm/mach-lh7a40x/irq-lh7a400.c')
-rw-r--r-- | arch/arm/mach-lh7a40x/irq-lh7a400.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-lh7a40x/irq-lh7a400.c b/arch/arm/mach-lh7a40x/irq-lh7a400.c index f9fdefef6d6f..091b2dc58d25 100644 --- a/arch/arm/mach-lh7a40x/irq-lh7a400.c +++ b/arch/arm/mach-lh7a40x/irq-lh7a400.c | |||
@@ -38,13 +38,15 @@ static void lh7a400_ack_gpio_irq (u32 irq) | |||
38 | INTC_INTENC = (1 << irq); | 38 | INTC_INTENC = (1 << irq); |
39 | } | 39 | } |
40 | 40 | ||
41 | static struct irqchip lh7a400_internal_chip = { | 41 | static struct irq_chip lh7a400_internal_chip = { |
42 | .name = "MPU", | ||
42 | .ack = lh7a400_mask_irq, /* Level triggering -> mask is ack */ | 43 | .ack = lh7a400_mask_irq, /* Level triggering -> mask is ack */ |
43 | .mask = lh7a400_mask_irq, | 44 | .mask = lh7a400_mask_irq, |
44 | .unmask = lh7a400_unmask_irq, | 45 | .unmask = lh7a400_unmask_irq, |
45 | }; | 46 | }; |
46 | 47 | ||
47 | static struct irqchip lh7a400_gpio_chip = { | 48 | static struct irq_chip lh7a400_gpio_chip = { |
49 | .name = "GPIO", | ||
48 | .ack = lh7a400_ack_gpio_irq, | 50 | .ack = lh7a400_ack_gpio_irq, |
49 | .mask = lh7a400_mask_irq, | 51 | .mask = lh7a400_mask_irq, |
50 | .unmask = lh7a400_unmask_irq, | 52 | .unmask = lh7a400_unmask_irq, |