Doh!

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

diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 84df2ce5bf5e1e8d9b11d081ec43acccb0c24993..7001c37d167c6f80c5c3e025f9a2841476f659bd 100644 (file)
--- 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);