fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / sh / drivers / pci / ops-snapgear.c

diff --git a/arch/sh/drivers/pci/ops-snapgear.c b/arch/sh/drivers/pci/ops-snapgear.c
index 6fdb976..53dd893 100644 (file)
--- a/arch/sh/drivers/pci/ops-snapgear.c
+++ b/arch/sh/drivers/pci/ops-snapgear.c
@@ -2,7 +2,7 @@
  * arch/sh/drivers/pci/ops-snapgear.c
  *
  * Author:  David McCullough <davidm@snapgear.com>
- * 
+ *
  * Ported to new API by Paul Mundt <lethal@linux-sh.org>
  *
  * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
@@ -12,16 +12,11 @@
  *
  * PCI initialization for the SnapGear boards
  */
-
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/delay.h>
 #include <linux/pci.h>
-
-#include <asm/io.h>
-#include "pci-sh7751.h"
+#include "pci-sh4.h"
 
 #define SNAPGEAR_PCI_IO                0x4000
 #define SNAPGEAR_PCI_MEM       0xfd000000
@@ -44,14 +39,12 @@ static struct resource sh7751_mem_resource = {
        .flags          = IORESOURCE_MEM,
 };
 
-extern struct pci_ops sh7751_pci_ops;
-
 struct pci_channel board_pci_channels[] = {
-       { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
+       { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
        { 0, }
 };
 
-static struct sh7751_pci_address_map sh7751_pci_map = {
+static struct sh4_pci_address_map sh7751_pci_map = {
        .window0        = {
                .base   = SH7751_CS2_BASE_ADDR,
                .size   = SNAPGEAR_LSR0_SIZE,
@@ -62,11 +55,11 @@ static struct sh7751_pci_address_map sh7751_pci_map = {
                .size   = SNAPGEAR_LSR1_SIZE,
        },
 
-       .flags  = SH7751_PCIC_NO_RESET,
+       .flags  = SH4_PCIC_NO_RESET,
 };
 
 /*
- * Initialize the SnapGear PCI interface 
+ * Initialize the SnapGear PCI interface
  * Setup hardware to be Central Funtion
  * Copy the BSR regs to the PCI interface
  * Setup PCI windows into local RAM
@@ -76,7 +69,7 @@ int __init pcibios_init_platform(void)
        return sh7751_pcic_init(&sh7751_pci_map);
 }
 
-int __init pcibios_map_platform_irq(u8 slot, u8 pin)
+int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
 {
        int irq = -1;
 
@@ -99,4 +92,3 @@ void __init pcibios_fixup(void)
 {
        /* Nothing to fixup .. */
 }
-