diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-04-09 04:05:30 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-04-09 04:05:30 -0400 |
commit | 664cee46e755b37204f1731cb8726db610f3486d (patch) | |
tree | 11ed0d43eff14123534785cf25c0a2143e134e7e /arch/powerpc/sysdev/cpm1.c | |
parent | a0334c50bf0ba7c720ed00f931e721c989efd233 (diff) | |
parent | 4e29402fe4b2006c994eed5020c42b2cc87d9b42 (diff) |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'arch/powerpc/sysdev/cpm1.c')
-rw-r--r-- | arch/powerpc/sysdev/cpm1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c index 0476bcc7c3e1..8b5aba263323 100644 --- a/arch/powerpc/sysdev/cpm1.c +++ b/arch/powerpc/sysdev/cpm1.c | |||
@@ -103,8 +103,8 @@ static int cpm_pic_host_map(struct irq_host *h, unsigned int virq, | |||
103 | { | 103 | { |
104 | pr_debug("cpm_pic_host_map(%d, 0x%lx)\n", virq, hw); | 104 | pr_debug("cpm_pic_host_map(%d, 0x%lx)\n", virq, hw); |
105 | 105 | ||
106 | irq_to_desc(virq)->status |= IRQ_LEVEL; | 106 | irq_set_status_flags(virq, IRQ_LEVEL); |
107 | set_irq_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq); | 107 | irq_set_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq); |
108 | return 0; | 108 | return 0; |
109 | } | 109 | } |
110 | 110 | ||