diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-28 09:06:57 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-28 09:06:57 +0300 |
| commit | 6afc0c269c3d20cde05515b00ede00e91fee0be5 (patch) | |
| tree | d54e7fa59df16bb62902129dfd28956d9ae1be19 /arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | |
| parent | 968d712a2565121b269e1037a1517916a9769423 (diff) | |
| parent | 097f70b3c4d84ffccca15195bdfde3a37c0a7c0f (diff) | |
| download | linux-6afc0c269c3d20cde05515b00ede00e91fee0be5.tar.xz | |
Merge branch 'linus' into perf/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/platforms/82xx/pq2ads-pci-pic.c')
| -rw-r--r-- | arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c index 74861a7fb807..60e89fc9c753 100644 --- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c @@ -78,7 +78,7 @@ static struct irq_chip pq2ads_pci_ic = { .irq_disable = pq2ads_pci_mask_irq }; -static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc) +static void pq2ads_pci_irq_demux(struct irq_desc *desc) { struct pq2ads_pci_pic *priv = irq_desc_get_handler_data(desc); u32 stat, mask, pend; |