diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-02-08 02:34:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-02-08 02:34:48 -0800 |
| commit | 793bf0b1a31a335ec649f79413bc1be85c320675 (patch) | |
| tree | d80689d31399775acda32bc7b4044e3dc6ce83c2 | |
| parent | f01525144ebd47803710b793f657ae6280ee54de (diff) | |
| parent | 2c9a07736e7c4d0432e9dc46695d19211a1e1a27 (diff) | |
Merge master.kernel.org:/home/mochel/BK/linux-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
| -rw-r--r-- | drivers/pcmcia/cardbus.c | 3 |
1 files changed, 1 insertions, 2 deletions
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); |