patch-2.4.27 linux-2.4.27/drivers/pcmcia/yenta.c

• Lines: 28
• Date: 2004-08-07 16:26:05.248371185 -0700
• Orig file: linux-2.4.26/drivers/pcmcia/yenta.c
• Orig date: 2004-04-14 06:05:31.000000000 -0700

diff -urN linux-2.4.26/drivers/pcmcia/yenta.c linux-2.4.27/drivers/pcmcia/yenta.c
@@ -35,6 +35,8 @@
 #define to_cycles(ns)	((ns)/120)
 #define to_ns(cycles)	((cycles)*120)
 
+static int override_bios;
+
 /*
  * Generate easy-to-use ways of reading a cardbus sockets
  * regular memory space ("cb_xxx"), configuration space
@@ -753,7 +755,7 @@
 
 	start = config_readl(socket, offset) & mask;
 	end = config_readl(socket, offset+4) | ~mask;
-	if (start && end > start) {
+	if (start && end > start && !override_bios) {
 		res->start = start;
 		res->end = end;
 		if (request_resource(root, res) == 0)
@@ -950,6 +952,9 @@
 
 	return 0;
 }
+  
+MODULE_PARM (override_bios, "i");
+MODULE_PARM_DESC (override_bios, "yenta ignore bios resource allocation");
 
 /*
  * Standard plain cardbus - no frills, no extensions