From: Patrick Mochel <mochel@segfault.osdlab.org>
Date: Fri, 8 Feb 2002 10:22:27 +0000 (-0800)
Subject: Doh!
X-Git-Tag: v2.5.4-pre5~2^2
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=2c9a07736e7c4d0432e9dc46695d19211a1e1a27;p=history.git

Doh!
struct device has no ->sysdata
and ->device should be ->dev
---

diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 84df2ce5bf5e..7001c37d167c 100644
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -279,8 +279,7 @@ int cb_alloc(socket_info_t * s)
 		pci_readw(dev, PCI_DEVICE_ID, &dev->device);
 		dev->hdr_type = hdr & 0x7f;
 
-		dev->dev.parent = bus->device;
-		dev->dev.sysdata = bus->sysdata;
+		dev->dev.parent = bus->dev;
 		strcpy(dev->dev.name, dev->name);
 		strcpy(dev->dev.bus_id, dev->slot_name);
 		device_register(&dev->dev);