mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 12:16:20 +00:00
19e0542620
In commit 51dcdfec6a ("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>
39 lines
980 B
C
39 lines
980 B
C
/*
|
|
* parport.h: platform-specific PC-style parport initialisation
|
|
*
|
|
* Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
|
|
*
|
|
* This file should only be included by drivers/parport/parport_pc.c.
|
|
*/
|
|
|
|
#ifndef _ASM_POWERPC_PARPORT_H
|
|
#define _ASM_POWERPC_PARPORT_H
|
|
#ifdef __KERNEL__
|
|
|
|
#include <asm/prom.h>
|
|
|
|
static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
|
|
{
|
|
struct device_node *np;
|
|
const u32 *prop;
|
|
u32 io1, io2;
|
|
int propsize;
|
|
int count = 0;
|
|
for (np = NULL; (np = of_find_compatible_node(np,
|
|
"parallel",
|
|
"pnpPNP,400")) != NULL;) {
|
|
prop = of_get_property(np, "reg", &propsize);
|
|
if (!prop || propsize > 6*sizeof(u32))
|
|
continue;
|
|
io1 = prop[1]; io2 = prop[2];
|
|
prop = of_get_property(np, "interrupts", NULL);
|
|
if (!prop)
|
|
continue;
|
|
if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL, 0) != NULL)
|
|
count++;
|
|
}
|
|
return count;
|
|
}
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* !(_ASM_POWERPC_PARPORT_H) */
|