[PATCH][2.4] Merged vr41xx_pci_ops into vr41xx.h

[Yoichi Yuasa <yuasa@hh.iij4u.or.jp>]

Hello Ralf,

I made a patch for vr41xx PCI.
"vr41xx_pci_ops" which has more than one were merged into vr41xx.h.

Please apply this patch to v2.4.

Yoichi

diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/nec-eagle/setup.c 
linux/arch/mips/vr41xx/nec-eagle/setup.c
--- linux-orig/arch/mips/vr41xx/nec-eagle/setup.c       2004-02-06 
11:21:47.000000000 +0900
+++ linux/arch/mips/vr41xx/nec-eagle/setup.c    2004-02-06 15:51:03.000000000 
+0900
@@ -70,8 +70,6 @@
        IORESOURCE_MEM
 };
 
-extern struct pci_ops vr41xx_pci_ops;
-
 struct pci_channel mips_pci_channels[] = {
        {&vr41xx_pci_ops, &vr41xx_pci_io_resource, &vr41xx_pci_mem_resource, 0, 
256},
        {NULL, NULL, NULL, 0, 0}
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/tanbac-tb0226/setup.c 
linux/arch/mips/vr41xx/tanbac-tb0226/setup.c
--- linux-orig/arch/mips/vr41xx/tanbac-tb0226/setup.c   2004-02-06 
11:21:47.000000000 +0900
+++ linux/arch/mips/vr41xx/tanbac-tb0226/setup.c        2004-02-06 
15:51:03.000000000 +0900
@@ -38,8 +38,6 @@
        IORESOURCE_MEM
 };
 
-extern struct pci_ops vr41xx_pci_ops;
-
 struct pci_channel mips_pci_channels[] = {
        {&vr41xx_pci_ops, &vr41xx_pci_io_resource, &vr41xx_pci_mem_resource, 0, 
256},
        {NULL, NULL, NULL, 0, 0}
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/tanbac-tb0229/setup.c 
linux/arch/mips/vr41xx/tanbac-tb0229/setup.c
--- linux-orig/arch/mips/vr41xx/tanbac-tb0229/setup.c   2004-02-06 
11:21:47.000000000 +0900
+++ linux/arch/mips/vr41xx/tanbac-tb0229/setup.c        2004-02-06 
15:51:03.000000000 +0900
@@ -43,8 +43,6 @@
        .flags  = IORESOURCE_MEM,
 };
 
-extern struct pci_ops vr41xx_pci_ops;
-
 struct pci_channel mips_pci_channels[] = {
        {       .pci_ops        = &vr41xx_pci_ops,
                .io_resource    = &vr41xx_pci_io_resource,
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/victor-mpc30x/setup.c 
linux/arch/mips/vr41xx/victor-mpc30x/setup.c
--- linux-orig/arch/mips/vr41xx/victor-mpc30x/setup.c   2004-02-06 
11:21:47.000000000 +0900
+++ linux/arch/mips/vr41xx/victor-mpc30x/setup.c        2004-02-06 
15:51:03.000000000 +0900
@@ -39,8 +39,6 @@
        IORESOURCE_MEM
 };
 
-extern struct pci_ops vr41xx_pci_ops;
-
 struct pci_channel mips_pci_channels[] = {
        {&vr41xx_pci_ops, &vr41xx_pci_io_resource, &vr41xx_pci_mem_resource, 0, 
256},
        {NULL, NULL, NULL, 0, 0}
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/zao-capcella/setup.c 
linux/arch/mips/vr41xx/zao-capcella/setup.c
--- linux-orig/arch/mips/vr41xx/zao-capcella/setup.c    2004-02-06 
11:21:47.000000000 +0900
+++ linux/arch/mips/vr41xx/zao-capcella/setup.c 2004-02-06 15:51:03.000000000 
+0900
@@ -39,8 +39,6 @@
        IORESOURCE_MEM
 };
 
-extern struct pci_ops vr41xx_pci_ops;
-
 struct pci_channel mips_pci_channels[] = {
        {&vr41xx_pci_ops, &vr41xx_pci_io_resource, &vr41xx_pci_mem_resource, 0, 
256},
        {NULL, NULL, NULL, 0, 0}
diff -urN -X dontdiff linux-orig/include/asm-mips/vr41xx/vr41xx.h 
linux/include/asm-mips/vr41xx/vr41xx.h
--- linux-orig/include/asm-mips/vr41xx/vr41xx.h 2003-12-16 05:27:37.000000000 
+0900
+++ linux/include/asm-mips/vr41xx/vr41xx.h      2004-02-06 15:51:03.000000000 
+0900
@@ -221,6 +221,8 @@
 
 extern void vr41xx_pciu_init(struct vr41xx_pci_address_map *map);
 
+extern struct pci_ops vr41xx_pci_ops;
+
 /*
  * MISC
  */