[Linux-mips-commits]CVS: linux/arch/mips/cobalt setup.c,1.11,1.12

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/cobalt
In directory usw-pr-cvs1:/tmp/cvs-serv30008

Modified Files:
	setup.c 
Log Message:
Having problems with the ioport and iomem regions. Added old values back in and it works again.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/cobalt/setup.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- setup.c	2001/11/01 19:30:43	1.11
+++ setup.c	2001/11/09 22:52:17	1.12
@@ -145,11 +145,16 @@
  	 * IO/MEM resources.
  	 */
 	mips_io_port_base = COBALT_LOCAL_IO_SPACE;
-	ioport_resource.start = 0x10000000;
-	ioport_resource.end = 0x11FFFFFF;
-	iomem_resource.start = 0x12000000;
-	iomem_resource.end = 0x13FFFFFF;
 
+#ifdef CONFIG_NEW_PCI
+        ioport_resource.start = 0x10000000;
+        ioport_resource.end = 0x11FFFFFF;
+        iomem_resource.start = 0x12000000;
+        iomem_resource.end = 0x13FFFFFF;
+#else
+        ioport_resource.start = 0x00000000;
+        ioport_resource.end = 0xFFFFFFFF;
+#endif
 	_machine_restart = cobalt_machine_restart;
 	_machine_halt = cobalt_machine_halt;
 	_machine_power_off = cobalt_machine_power_off;