projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
[powerpc.git]
/
drivers
/
mfd
/
mcp-core.c
diff --git
a/drivers/mfd/mcp-core.c
b/drivers/mfd/mcp-core.c
index
55ba230
..
75f401d
100644
(file)
--- a/
drivers/mfd/mcp-core.c
+++ b/
drivers/mfd/mcp-core.c
@@
-77,6
+77,8
@@
static int mcp_bus_resume(struct device *dev)
static struct bus_type mcp_bus_type = {
.name = "mcp",
.match = mcp_bus_match,
static struct bus_type mcp_bus_type = {
.name = "mcp",
.match = mcp_bus_match,
+ .probe = mcp_bus_probe,
+ .remove = mcp_bus_remove,
.suspend = mcp_bus_suspend,
.resume = mcp_bus_resume,
};
.suspend = mcp_bus_suspend,
.resume = mcp_bus_resume,
};
@@
-227,8
+229,6
@@
EXPORT_SYMBOL(mcp_host_unregister);
int mcp_driver_register(struct mcp_driver *mcpdrv)
{
mcpdrv->drv.bus = &mcp_bus_type;
int mcp_driver_register(struct mcp_driver *mcpdrv)
{
mcpdrv->drv.bus = &mcp_bus_type;
- mcpdrv->drv.probe = mcp_bus_probe;
- mcpdrv->drv.remove = mcp_bus_remove;
return driver_register(&mcpdrv->drv);
}
EXPORT_SYMBOL(mcp_driver_register);
return driver_register(&mcpdrv->drv);
}
EXPORT_SYMBOL(mcp_driver_register);