--- 2.6/drivers/pcmcia/yenta_socket.c	2004-05-15 11:21:38.000000000 +0200
+++ build-2.6/drivers/pcmcia/yenta_socket.c	2004-05-15 15:00:22.000000000 +0200
@@ -40,7 +40,7 @@
 #define to_ns(cycles)	((cycles)*120)
 
 static int yenta_probe_cb_irq(struct yenta_socket *socket);
-
+static int override_bios;
 
 /*
  * Generate easy-to-use ways of reading a cardbus sockets
@@ -548,7 +548,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)
@@ -1105,6 +1105,8 @@
 };
 MODULE_DEVICE_TABLE(pci, yenta_table);
 
+MODULE_PARM (override_bios, "i");
+MODULE_PARM_DESC (override_bios, "yenta ignore bios resource allocation");
 
 static struct pci_driver yenta_cardbus_driver = {
 	.name		= "yenta_cardbus",