Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c
index dbe8378..9ddff76 100644 (file)
--- a/arch/sh/drivers/pci/pci-sh7751.c
+++ b/arch/sh/drivers/pci/pci-sh7751.c
@@ -155,16 +155,7 @@ int __init sh7751_pcic_init(struct sh4_pci_address_map *map)
         */
        pr_debug("PCI: Mapping IO address 0x%x - 0x%x to base 0x%x\n",
                 PCIBIOS_MIN_IO, (64 << 10),
-                SH4_PCI_IO_BASE + PCIBIOS_MIN_IO);
-
-       /*
-        * XXX: For now, leave this board-specific. In the event we have other
-        * boards that need to do similar work, this can be wrapped.
-        */
-#ifdef CONFIG_SH_BIGSUR
-       bigsur_port_map(PCIBIOS_MIN_IO, (64 << 10),
-                       SH4_PCI_IO_BASE + PCIBIOS_MIN_IO, 0);
-#endif
+                SH7751_PCI_IO_BASE + PCIBIOS_MIN_IO);
 
        /* Make sure the MSB's of IO window are set to access PCI space
         * correctly */