summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/parport.h
diff options
context:
space:
mode:
authorTony Breeds <tony@bakeyournoodle.com>2009-04-14 14:58:41 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-14 08:48:50 -0700
commit19e05426201651fe24c4e07bef7f6de0d2305218 (patch)
tree89521781eedc280373c0c0e737e106b3a6dcc576 /arch/powerpc/include/asm/parport.h
parent28783eb52013ad20784550bccd482e541c9619c2 (diff)
downloadop-kernel-dev-19e05426201651fe24c4e07bef7f6de0d2305218.zip
op-kernel-dev-19e05426201651fe24c4e07bef7f6de0d2305218.tar.gz
parport_pc: 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 Signed-off-by: Tony Breeds <tony@bakeyournoodle.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/include/asm/parport.h')
-rw-r--r--arch/powerpc/include/asm/parport.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/parport.h b/arch/powerpc/include/asm/parport.h
index 414c50e..94942d6 100644
--- a/arch/powerpc/include/asm/parport.h
+++ b/arch/powerpc/include/asm/parport.h
@@ -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;
OpenPOWER on IntegriCloud