From e283b7286ac0ee8eadac3f137dcd7e157826f72c Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 5 Jan 2006 14:40:58 +0000 Subject: [PATCH] --- yaml --- r: 18391 b: refs/heads/master c: 1d0baa3a1c836f0403b318d549fd49ebc73ee631 h: refs/heads/master i: 18389: ac99528e661d230baf502387f94b8f3eb42f1c78 18387: 51625dea8d8ff4c2b92350950dbe2c6bc81c9a67 18383: 8bf41aa47d080abf4835ebec004b0bc7d01e24f7 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/ds.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c4cd77242cc7..f4decaa2ba36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d0b653cdfde193944784c01fa3359b0a444dcf1 +refs/heads/master: 1d0baa3a1c836f0403b318d549fd49ebc73ee631 diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c index 621ec459d27a..0a424a4e8187 100644 --- a/trunk/drivers/pcmcia/ds.c +++ b/trunk/drivers/pcmcia/ds.c @@ -311,8 +311,6 @@ int pcmcia_register_driver(struct pcmcia_driver *driver) /* initialize common fields */ driver->drv.bus = &pcmcia_bus_type; driver->drv.owner = driver->owner; - driver->drv.probe = pcmcia_device_probe; - driver->drv.remove = pcmcia_device_remove; return driver_register(&driver->drv); } @@ -1200,6 +1198,8 @@ struct bus_type pcmcia_bus_type = { .uevent = pcmcia_bus_uevent, .match = pcmcia_bus_match, .dev_attrs = pcmcia_dev_attrs, + .probe = pcmcia_device_probe, + .remove = pcmcia_device_remove, .suspend = pcmcia_dev_suspend, .resume = pcmcia_dev_resume, };