diff options
| author | Patrick McHardy | 2011-04-13 13:32:28 +0200 |
|---|---|---|
| committer | Patrick McHardy | 2011-04-13 13:32:28 +0200 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /arch/powerpc/platforms/85xx/sbc8560.c | |
| parent | netfilter: ipset: References are protected by rwlock instead of mutex (diff) | |
| parent | netfilter: xt_conntrack: fix inverted conntrack direction test (diff) | |
| download | kernel-qcow2-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.tar.gz kernel-qcow2-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.tar.xz kernel-qcow2-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'arch/powerpc/platforms/85xx/sbc8560.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/sbc8560.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c index d7e28ec3e072..d2dfd465fbf6 100644 --- a/arch/powerpc/platforms/85xx/sbc8560.c +++ b/arch/powerpc/platforms/85xx/sbc8560.c @@ -41,7 +41,7 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc) { - struct irq_chip *chip = get_irq_desc_chip(desc); + struct irq_chip *chip = irq_desc_get_chip(desc); int cascade_irq; while ((cascade_irq = cpm2_get_irq()) >= 0) @@ -92,7 +92,7 @@ static void __init sbc8560_pic_init(void) cpm2_pic_init(np); of_node_put(np); - set_irq_chained_handler(irq, cpm2_cascade); + irq_set_chained_handler(irq, cpm2_cascade); #endif } |