Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[karo-tx-linux.git] / arch / powerpc / platforms / 82xx / pq2ads-pci-pic.c

diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
index a8013816125c2df40ab5ca5fd25e9da0d60460c7..9876d7e072f46b3f825dc9df9683ac2b573cf1ae 100644 (file)
--- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
+++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -109,7 +109,7 @@ static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
 {
        get_irq_desc(virq)->status |= IRQ_LEVEL;
        set_irq_chip_data(virq, h->host_data);
-       set_irq_chip(virq, &pq2ads_pci_ic);
+       set_irq_chip_and_handler(virq, &pq2ads_pci_ic, handle_level_irq);
        return 0;
 }