Release of pcmciautils-006 (2005-07-15)

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

3 files changed, 13 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 46e5590..586512a 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ PCMCIA_SOCKET_STARTUP =		pcmcia-socket-startup
 CBDUMP =			cbdump
 CISDUMP =			dump_cis
 
-VERSION =	005
+VERSION =	006
 #INSTALL_DIR =	/usr/local/sbin
 RELEASE_NAME =	pcmciautils-$(VERSION)
 
diff --git a/config/config.opts b/config/config.opts
index 8e4e090..ccd8231 100644
--- a/config/config.opts
+++ b/config/config.opts
@@ -16,7 +16,10 @@
 # the PCI hotplug subsystem.
 #
 
-include port 0x100-0x4ff, port 0x800-0x8ff, port 0xc00-0xcff
+# Exclude 3b0->3bb & 3d3 as Radeon IGP MCE's if you touch these ports
+include port 0x100-0x3af, port 0x3c0-0x3d2, port 0x3d4-0x4ff
+include port 0x800-0x8ff, port 0xc00-0xcff
+
 include memory 0xc0000-0xfffff
 include memory 0xa0000000-0xa0ffffff, memory 0x60000000-0x60ffffff
 
@@ -25,12 +28,3 @@ include memory 0xa0000000-0xa0ffffff, memory 0x60000000-0x60ffffff
 
 # Extra port range for IBM Token Ring
 include port 0xa00-0xaff
-
-# Resources we should not use, even if they appear to be available
-
-# First built-in serial port
-exclude irq 4
-# Second built-in serial port
-#exclude irq 3
-# First built-in parallel port
-exclude irq 7
diff --git a/src/startup.c b/src/startup.c
index 7b3d093..1eedbce 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -204,10 +204,16 @@ static void adjust_resources(unsigned int socket_no)
 
 int main(int argc, char *argv[])
 {
+	char *socket_no;
 	unsigned long socket;
 
-	if (argc != 2)
-		return -EINVAL;
+	if (argc != 2) {
+		if ((socket_no = getenv("SOCKET_NO"))) {
+			socket = strtoul(argv[1], NULL, 0);
+		} else {
+			return -EINVAL;
+		}
+	}
 
 	socket = strtoul(argv[1], NULL, 0);