diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 06:30:03 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 06:30:03 +0200 |
commit | 060ec6f2fb3c8abb85927758de8ac5d1018e6a43 (patch) | |
tree | 14d451f638805a4db17d6cf38d5003220b1314df /arch/arm/mach-footbridge/isa-irq.c | |
parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
parent | [ARM] Fix lh7a40x_udc.c (diff) | |
download | linux-060ec6f2fb3c8abb85927758de8ac5d1018e6a43.tar.xz linux-060ec6f2fb3c8abb85927758de8ac5d1018e6a43.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix lh7a40x_udc.c
[ARM] Fix warning in consistent.c
[ARM] Fix warnings in arch/arm/kernel/setup.c
[ARM] Fix ecard.c resource warnings.
[ARM] Fix ISA IRQ resources
[ARM] Fix bad asm instruction in proc-arm925.S
[ARM] More missing proc-macros.S includes
[ARM] 3708/2: fix SMP build after section ioremap changes
Diffstat (limited to 'arch/arm/mach-footbridge/isa-irq.c')
-rw-r--r-- | arch/arm/mach-footbridge/isa-irq.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c index e1c43b331d64..87448c2d6baa 100644 --- a/arch/arm/mach-footbridge/isa-irq.c +++ b/arch/arm/mach-footbridge/isa-irq.c @@ -98,9 +98,22 @@ isa_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) desc_handle_irq(isa_irq, desc, regs); } -static struct irqaction irq_cascade = { .handler = no_action, .name = "cascade", }; -static struct resource pic1_resource = { "pic1", 0x20, 0x3f }; -static struct resource pic2_resource = { "pic2", 0xa0, 0xbf }; +static struct irqaction irq_cascade = { + .handler = no_action, + .name = "cascade", +}; + +static struct resource pic1_resource = { + .name = "pic1", + .start = 0x20, + .end = 0x3f, +}; + +static struct resource pic2_resource = { + .name = "pic2", + .start = 0xa0, + .end = 0xbf, +}; void __init isa_init_irq(unsigned int host_irq) { |