Re: 2.6.21-rc5-mm1

[Badari Pulavarty]

On Mon, 2007-03-26 at 20:57 -0800, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.21-rc5/2.6.21-rc5-mm1/
> 
> 

  CC [M]  drivers/parport/parport_pc.o
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â:
drivers/parport/parport_pc.c:2509: warning: passing argument 5 of
âparport_pc_probe_portâ from incompatible pointer type
drivers/parport/parport_pc.c: In function âsio_via_probeâ:
drivers/parport/parport_pc.c:2692: warning: passing argument 5 of
âparport_pc_probe_portâ from incompatible pointer type
drivers/parport/parport_pc.c: In function âparport_pc_pci_probeâ:
drivers/parport/parport_pc.c:2990: warning: passing argument 5 of
âparport_pc_probe_portâ from incompatible pointer type
drivers/parport/parport_pc.c: In function âparport_pc_pnp_probeâ:
drivers/parport/parport_pc.c:3098: warning: passing argument 5 of
âparport_pc_probe_portâ from incompatible pointer type
make[2]: *** [drivers/parport/parport_pc.o] Error 1
make[1]: *** [drivers/parport] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [drivers] Error 2
make: *** Waiting for unfinished jobs....


Patch that is causing the problem in -mm:
parport-dev-driver-model-support.patch


Here is the fix.

Thanks,
Badari

Signed-off-by: Badari Pulavarty <pbadari@xxxxxxxxxx>
---
 include/asm-powerpc/parport.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.21-rc5/include/asm-powerpc/parport.h
===================================================================
--- linux-2.6.21-rc5.orig/include/asm-powerpc/parport.h	2007-03-27 09:47:13.000000000 -0700
+++ linux-2.6.21-rc5/include/asm-powerpc/parport.h	2007-03-27 09:47:54.000000000 -0700
@@ -15,7 +15,7 @@
 extern struct parport *parport_pc_probe_port (unsigned long int base,
                                               unsigned long int base_hi,
                                               int irq, int dma,
-                                              struct pci_dev *dev);
+                                              struct device *dev);
 
 static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
 {


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/