3 files changed, 14 insertions, 20 deletions

diff --git a/arch/sh/drivers/pci/Kconfig b/arch/sh/drivers/pci/Kconfig
index 5aaee3c707b0..1d53496b1498 100644
--- a/arch/sh/drivers/pci/Kconfig
+++ b/arch/sh/drivers/pci/Kconfig
@@ -20,11 +20,8 @@ config SH_PCIDMA_NONCOHERENT
 
 # Temporary config option for transitioning off of PCI_AUTO
 config PCI_NEW
-        bool
+        def_bool y
         depends on PCI
-        default y if CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7780 || \
-                     CPU_SUBTYPE_SH7785 || CPU_SH5 || \
-                     CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R
 
 # This is also board-specific
 config PCI_AUTO
diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c
index 48c6381fffaa..ed7f489936f1 100644
--- a/arch/sh/drivers/pci/fixups-dreamcast.c
+++ b/arch/sh/drivers/pci/fixups-dreamcast.c
@@ -30,7 +30,7 @@
 
 static void __init gapspci_fixup_resources(struct pci_dev *dev)
 {
-        struct pci_channel *p = board_pci_channels;
+        struct pci_channel *p = dev->sysdata;
 
         printk(KERN_NOTICE "PCI: Fixing up device %s\n", pci_name(dev));
 
diff --git a/arch/sh/drivers/pci/pci-dreamcast.c b/arch/sh/drivers/pci/pci-dreamcast.c
index 0897be5053d4..210f9d4af141 100644
--- a/arch/sh/drivers/pci/pci-dreamcast.c
+++ b/arch/sh/drivers/pci/pci-dreamcast.c
@@ -21,7 +21,6 @@
 #include <linux/irq.h>
 #include <linux/pci.h>
 #include <linux/module.h>
-
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <mach/pci.h>
@@ -40,11 +39,19 @@ static struct resource gapspci_mem_resource = {
         .flags  = IORESOURCE_MEM,
 };
 
+static struct pci_channel dreamcast_pci_controller = {
+        .pci_ops        = &gapspci_pci_ops,
+        .io_resource    = &gapspci_io_resource,
+        .io_offset      = 0x00000000,
+        .mem_resource   = &gapspci_mem_resource,
+        .mem_offset     = 0x00000000,
+};
+
 /*
  * gapspci init
  */
 
-static int __init gapspci_init(struct pci_channel *chan)
+static int __init gapspci_init(void)
 {
         char idbuf[16];
         int i;
@@ -88,18 +95,8 @@ static int __init gapspci_init(struct pci_channel *chan)
         outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);
         outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);
 
+        register_pci_controller(&dreamcast_pci_controller);
+
         return 0;
 }
-
-struct pci_channel board_pci_channels[] = {
-        {
-                .init           = gapspci_init,
-                .pci_ops        = &gapspci_pci_ops,
-                .io_resource    = &gapspci_io_resource,
-                .mem_resource   = &gapspci_mem_resource,
-                .first_devfn    = 0,
-                .last_devfn     = 1,
-        }, {
-                .init           = NULL,
-        }
-};
+arch_initcall(gapspci_init);