git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
m82xx_pci.c
diff --git
a/arch/ppc/syslib/m82xx_pci.c
b/arch/ppc/syslib/m82xx_pci.c
index
1941a8c
..
e3b586b
100644
(file)
--- a/
arch/ppc/syslib/m82xx_pci.c
+++ b/
arch/ppc/syslib/m82xx_pci.c
@@
-117,7
+117,7
@@
struct hw_interrupt_type pq2pci_ic = {
};
static irqreturn_t
};
static irqreturn_t
-pq2pci_irq_demux(int irq, void *dev_id
, struct pt_regs *regs
)
+pq2pci_irq_demux(int irq, void *dev_id)
{
unsigned long stat, mask, pend;
int bit;
{
unsigned long stat, mask, pend;
int bit;
@@
-130,7
+130,7
@@
pq2pci_irq_demux(int irq, void *dev_id, struct pt_regs *regs)
break;
for (bit = 0; pend != 0; ++bit, pend <<= 1) {
if (pend & 0x80000000)
break;
for (bit = 0; pend != 0; ++bit, pend <<= 1) {
if (pend & 0x80000000)
- __do_IRQ(NR_CPM_INTS + bit
, regs
);
+ __do_IRQ(NR_CPM_INTS + bit);
}
}
}
}
@@
-139,7
+139,7
@@
pq2pci_irq_demux(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction pq2pci_irqaction = {
.handler = pq2pci_irq_demux,
static struct irqaction pq2pci_irqaction = {
.handler = pq2pci_irq_demux,
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.mask = CPU_MASK_NONE,
.name = "PQ2 PCI cascade",
};
.mask = CPU_MASK_NONE,
.name = "PQ2 PCI cascade",
};
@@
-159,7
+159,7
@@
pq2pci_init_irq(void)
immap->im_memctl.memc_or8 = 0xffff8010;
#endif
for (irq = NR_CPM_INTS; irq < NR_CPM_INTS + 4; irq++)
immap->im_memctl.memc_or8 = 0xffff8010;
#endif
for (irq = NR_CPM_INTS; irq < NR_CPM_INTS + 4; irq++)
- irq_desc[irq].
handler
= &pq2pci_ic;
+ irq_desc[irq].
chip
= &pq2pci_ic;
/* make PCI IRQ level sensitive */
immap->im_intctl.ic_siexr &=
/* make PCI IRQ level sensitive */
immap->im_intctl.ic_siexr &=