Fix build failure drivers/parport/parport_pc.c for powerpc
Subsystems (2)
PATCH 1/1 Fix build failure drivers/parport/parport_pc.c for powerpc
In commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI IRQ if offered) parport_pc_probe_port() gained an irqflags arg. This isn't being supplied on powerpc. This patch make powerpc fallback to the old behaviour, that is using "0" for irqflags.
Fixes build failure:
In file included from drivers/parport/parport_pc.c:68:arch/powerpc/include/asm/parport.h: In function 'parport_pc_find_nonpci_ports':arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port' arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port' arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port' make[3]: *** [drivers/parport/parport_pc.o] Error 1
---
Resend due to MUA badness
arch/powerpc/include/asm/parport.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/include/asm/parport.h +1 -1
@@ -29,7 +29,7 @@ static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) prop =of_get_property (np,"interrupts" ,NULL );if (!prop)continue ; -if (parport_pc_probe_port (io1, io2, prop[0 ], autodma,NULL ) !=NULL ) +if (parport_pc_probe_port (io1, io2, prop[0 ], autodma,NULL ,0 ) !=NULL ) count++; }return count;
Signature · 1 line
1.6.0.6
PATCH 1/1 parisc: fix the parameters of call to parport_pc_probe_port()
commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI IRQ if offered) parport_pc_probe_port() gained an irqflags arg. This break parisc. This patch make parisc fallback to the old behaviour, that is using "0" for irqflags.
No test.
--- drivers/parisc/superio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/parisc/superio.c +2 -1
@@ -434,7 +434,8 @@ static void __init superio_parport_init(void) 0 /*base_hi*/, PAR_IRQ, PARPORT_DMA_NONE /* dma */, - NULL /*struct pci_dev* */) ) + NULL /*struct pci_dev* */, + 0)) printk(KERN_WARNING PFX "Probing parallel port failed.\n");#endif /* CONFIG_PARPORT_PC */
Signature · 1 line
1.5.3.8
Re: [PATCH] parisc: fix the parameters of call to parport_pc_probe_port()
Quoted 7 lines · Wei Yongjun
commit
51dcdfec6a274afc1c6fce180d582add9ff512c0(parport: Use the PCI IRQ if offered)parport_pc_probe_port()gained an irqflags arg. This break parisc. This patch make parisc fallback to the old behaviour, that is using "0" for irqflags.No test.
Looks good, thanks, applied.