Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / arch / mips / pci / pci-jmr3927.c

diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c
index 24943a2..cb84f4e 100644 (file)
--- a/arch/mips/pci/pci-jmr3927.c
+++ b/arch/mips/pci/pci-jmr3927.c
@@ -4,6 +4,7 @@
  *              ahennessy@mvista.com
  *
  * Copyright (C) 2000-2001 Toshiba Corporation
+ * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
  *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the
@@ -30,22 +31,21 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/pci_channel.h>
 #include <asm/jmr3927/jmr3927.h>
 #include <asm/debug.h>
 
 struct resource pci_io_resource = {
-       "IO MEM",
-       0x1000,                 /* reserve regacy I/O space */
-       0x1000 + JMR3927_PCIIO_SIZE - 1,
-       IORESOURCE_IO
+       .name   = "IO MEM",
+       .start  = 0x1000,                       /* reserve regacy I/O space */
+       .end    = 0x1000 + JMR3927_PCIIO_SIZE - 1,
+       .flags  = IORESOURCE_IO
 };
 
 struct resource pci_mem_resource = {
-       "PCI MEM",
-       JMR3927_PCIMEM,
-       JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1,
-       IORESOURCE_MEM
+       .name   = "PCI MEM",
+       .start  = JMR3927_PCIMEM,
+       .end    = JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1,
+       .flags  = IORESOURCE_MEM
 };
 
 extern struct pci_ops jmr3927_pci_ops;
@@ -54,5 +54,5 @@ struct pci_controller jmr3927_controller = {
        .pci_ops        = &jmr3927_pci_ops,
        .io_resource    = &pci_io_resource,
        .mem_resource   = &pci_mem_resource,
-       .mem_offset     = JMR3927_PCIMEM;
+       .mem_offset     = JMR3927_PCIMEM
 };