-- do not use yet --

Index: 2.6.13-git4/drivers/pcmcia/yenta_socket.c
===================================================================
--- 2.6.13-git4.orig/drivers/pcmcia/yenta_socket.c
+++ 2.6.13-git4/drivers/pcmcia/yenta_socket.c
@@ -918,27 +918,8 @@ static void yenta_get_socket_capabilitie
 static void yenta_config_init(struct yenta_socket *socket)
 {
 	u16 bridge;
-	struct pci_dev *dev = socket->dev;
-	struct pci_bus_region region;
-
-	pcibios_resource_to_bus(socket->dev, &region, &dev->resource[0]);
 
 	config_writel(socket, CB_LEGACY_MODE_BASE, 0);
-	config_writel(socket, PCI_BASE_ADDRESS_0, region.start);
-	config_writew(socket, PCI_COMMAND,
-			PCI_COMMAND_IO |
-			PCI_COMMAND_MEMORY |
-			PCI_COMMAND_MASTER |
-			PCI_COMMAND_WAIT);
-
-	/* MAGIC NUMBERS! Fixme */
-	config_writeb(socket, PCI_CACHE_LINE_SIZE, L1_CACHE_BYTES / 4);
-	config_writeb(socket, PCI_LATENCY_TIMER, 168);
-	config_writel(socket, PCI_PRIMARY_BUS,
-		(176 << 24) |			   /* sec. latency timer */
-		(dev->subordinate->subordinate << 16) | /* subordinate bus */
-		(dev->subordinate->secondary << 8) |  /* secondary bus */
-		dev->subordinate->primary);		   /* primary bus */
 
 	/*
 	 * Set up the bridging state:
@@ -1024,6 +1005,8 @@ static int __devinit yenta_probe (struct
 	/* Set up the bridge regions.. */
 	yenta_allocate_resources(socket);
 
+	pci_set_master(dev);
+
 	socket->cb_irq = dev->irq;
 
 	/* Do we have special options for the device? */