sh: pci: Kill off unused SH4_PCIC_NO_RESET code.

[pandora-kernel.git] / arch / sh / drivers / pci / ops-landisk.c

diff --git a/arch/sh/drivers/pci/ops-landisk.c b/arch/sh/drivers/pci/ops-landisk.c
index ada301c..178b778 100644 (file)
--- a/arch/sh/drivers/pci/ops-landisk.c
+++ b/arch/sh/drivers/pci/ops-landisk.c
@@ -8,7 +8,6 @@
  * May be copied or modified under the terms of the GNU General Public
  * License.  See linux/COPYING for more information.
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
@@ -18,8 +17,8 @@
 
 static struct resource sh7751_io_resource = {
        .name = "SH7751 IO",
-       .start = 0x4000,
-       .end = 0x4000 + SH7751_PCI_IO_SIZE - 1,
+       .start = SH7751_PCI_IO_BASE,
+       .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1,
        .flags = IORESOURCE_IO
 };
 
@@ -31,7 +30,7 @@ static struct resource sh7751_mem_resource = {
 };
 
 struct pci_channel board_pci_channels[] = {
-       {&sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0x3ff},
+       { sh7751_pci_init, &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0x3ff},
        {NULL, NULL, NULL, 0, 0},
 };
 
@@ -40,13 +39,11 @@ static struct sh4_pci_address_map sh7751_pci_map = {
                .base   = SH7751_CS3_BASE_ADDR,
                .size   = (64 << 20),   /* 64MB */
        },
-
-       .flags = SH4_PCIC_NO_RESET,
 };
 
 int __init pcibios_init_platform(void)
 {
-       return sh7751_pcic_init(&sh7751_pci_map);
+       return sh7751_pcic_init(&board_pci_channels[0], &sh7751_pci_map);
 }
 
 int pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)