VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / mips / vr41xx / tanbac-tb0229 / setup.c

diff --git a/arch/mips/vr41xx/tanbac-tb0229/setup.c b/arch/mips/vr41xx/tanbac-tb0229/setup.c
index 971473e..9209e3d 100644 (file)
--- a/arch/mips/vr41xx/tanbac-tb0229/setup.c
+++ b/arch/mips/vr41xx/tanbac-tb0229/setup.c
@@ -21,60 +21,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <linux/config.h>
-#include <linux/ioport.h>
 
-#include <asm/io.h>
-#include <asm/pci_channel.h>
-#include <asm/reboot.h>
-#include <asm/vr41xx/tb0229.h>
-
-#ifdef CONFIG_PCI
-static struct resource vr41xx_pci_io_resource = {
-       .name   = "PCI I/O space",
-       .start  = VR41XX_PCI_IO_START,
-       .end    = VR41XX_PCI_IO_END,
-       .flags  = IORESOURCE_IO,
-};
-
-static struct resource vr41xx_pci_mem_resource = {
-       .name   = "PCI memory space",
-       .start  = VR41XX_PCI_MEM_START,
-       .end    = VR41XX_PCI_MEM_END,
-       .flags  = IORESOURCE_MEM,
-};
-
-extern struct pci_ops vr41xx_pci_ops;
-
-struct pci_controller vr41xx_controller = {
-       .pci_ops        = &vr41xx_pci_ops,
-       .io_resource    = &vr41xx_pci_io_resource,
-       .mem_resource   = &vr41xx_pci_mem_resource,
-};
-
-struct vr41xx_pci_address_space vr41xx_pci_mem1 = {
-       .internal_base  = VR41XX_PCI_MEM1_BASE,
-       .address_mask   = VR41XX_PCI_MEM1_MASK,
-       .pci_base       = IO_MEM1_RESOURCE_START,
-};
-
-struct vr41xx_pci_address_space vr41xx_pci_mem2 = {
-       .internal_base  = VR41XX_PCI_MEM2_BASE,
-       .address_mask   = VR41XX_PCI_MEM2_MASK,
-       .pci_base       = IO_MEM2_RESOURCE_START,
-};
-
-struct vr41xx_pci_address_space vr41xx_pci_io = {
-       .internal_base  = VR41XX_PCI_IO_BASE,
-       .address_mask   = VR41XX_PCI_IO_MASK,
-       .pci_base       = IO_PORT_RESOURCE_START
-};
-
-static struct vr41xx_pci_address_map pci_address_map = {
-       .mem1   = &vr41xx_pci_mem1,
-       .mem2   = &vr41xx_pci_mem2,
-       .io     = &vr41xx_pci_io,
-};
-#endif
+#include <asm/vr41xx/vr41xx.h>
 
 const char *get_system_type(void)
 {
@@ -83,24 +31,12 @@ const char *get_system_type(void)
 
 static int tanbac_tb0229_setup(void)
 {
-       set_io_port_base(IO_PORT_BASE);
-       ioport_resource.start = IO_PORT_RESOURCE_START;
-       ioport_resource.end = IO_PORT_RESOURCE_END;
-
 #ifdef CONFIG_SERIAL_8250
        vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
        vr41xx_siu_init();
        vr41xx_dsiu_init();
 #endif
 
-#ifdef CONFIG_PCI
-       vr41xx_pciu_init(&pci_address_map);
-#endif
-
-#ifdef CONFIG_TANBAC_TB0219
-       _machine_restart = tanbac_tb0229_restart;
-#endif
-
        return 0;
 }