projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d0b653
)
[PATCH] Add pcmcia_bus_type probe and remove methods
author
Russell King
<rmk@arm.linux.org.uk>
Thu, 5 Jan 2006 14:40:58 +0000
(14:40 +0000)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Fri, 13 Jan 2006 19:26:08 +0000
(11:26 -0800)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/pcmcia/ds.c
patch
|
blob
|
history
diff --git
a/drivers/pcmcia/ds.c
b/drivers/pcmcia/ds.c
index
621ec45
..
0a424a4
100644
(file)
--- a/
drivers/pcmcia/ds.c
+++ b/
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,
};