Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Fri, 8 Feb 2002 21:24:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Fri, 8 Feb 2002 21:24:44 -0500 Received: from air-2.osdl.org ([65.201.151.6]:32696 "EHLO segfault.osdlab.org") by vger.kernel.org with ESMTP id ; Fri, 8 Feb 2002 21:24:37 -0500 Date: Fri, 8 Feb 2002 18:25:17 -0800 (PST) From: Patrick Mochel X-X-Sender: To: Subject: [bk patch] Make cardbus compile in -pre4 Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org I broke cardbus compile in -pre4 on accident. Sorry about that... (I don't have a public repository yet, so there's no place to pull form) diffstat results: drivers/pcmcia/cardbus.c | 3 +-- 1 files changed, 1 insertion, 2 deletions ChangeSet 1.231 02/02/08 18:22:27 mochel@segfault.osdlab.org +1 -0 Doh! struct device has no ->sysdata and ->device should be ->dev drivers/pcmcia/cardbus.c 1.7 02/02/08 18:22:27 mochel@segfault.osdlab.org +1 -2 Doh! struct device has no ->sysdata and ->device should be ->dev diff -Nru a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c --- a/drivers/pcmcia/cardbus.c Fri Feb 8 18:23:08 2002 +++ b/drivers/pcmcia/cardbus.c Fri Feb 8 18:23:08 2002 @@ -279,8 +279,7 @@ 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); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/