From: Andrew Morton <akpm@linux-foundation.org>

http://test.kernel.org/abat/79954/debug/test.log.0 says:

In file included from drivers/parport/parport_pc.c:66:
include/asm/parport.h:18: error: conflicting types for parport_pc_probe_port
include/linux/parport_pc.h:234: error: previous declaration of parport_pc_probe_port was here
drivers/parport/parport_pc.c:2379: error: conflicting types for parport_pc_probe_port
drivers/parport/parport_pc.c:2152: error: previous definition of parport_pc_probe_port was here
drivers/parport/parport_pc.c: In function sio_ite_8872_probe:

I don't think this declaration should be in an arch header at all.  Take it
out, see what happens ;)

Why on earth do we have a noninlined function in a header file?  Sigh.

Cc: David Brownell <david-b@pacbell.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-powerpc/parport.h |    5 -----
 1 files changed, 5 deletions(-)

diff -puN include/asm-powerpc/parport.h~parport-dev-driver-model-support-powerpc-fix include/asm-powerpc/parport.h
--- a/include/asm-powerpc/parport.h~parport-dev-driver-model-support-powerpc-fix
+++ a/include/asm-powerpc/parport.h
@@ -12,11 +12,6 @@
 
 #include <asm/prom.h>
 
-extern struct parport *parport_pc_probe_port (unsigned long int base,
-                                              unsigned long int base_hi,
-                                              int irq, int dma,
-                                              struct pci_dev *dev);
-
 static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
 {
 	struct device_node *np;
_