From ac99528e661d230baf502387f94b8f3eb42f1c78 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@arm.linux.org.uk>
Date: Thu, 5 Jan 2006 14:39:56 +0000
Subject: [PATCH] --- yaml --- r: 18389 b: refs/heads/master c:
 413b486e18587fd53c9954252e6648f9450c734e h: refs/heads/master i:   18387:
 51625dea8d8ff4c2b92350950dbe2c6bc81c9a67 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mfd/mcp-core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 50f996f8a519..cdaa9e01e5e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4866b124a1ded3b94b0cea0bd543f46ffa9a3943
+refs/heads/master: 413b486e18587fd53c9954252e6648f9450c734e
diff --git a/trunk/drivers/mfd/mcp-core.c b/trunk/drivers/mfd/mcp-core.c
index 55ba23075c90..75f401d52fda 100644
--- a/trunk/drivers/mfd/mcp-core.c
+++ b/trunk/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,
+	.probe		= mcp_bus_probe,
+	.remove		= mcp_bus_remove,
 	.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;
-	mcpdrv->drv.probe = mcp_bus_probe;
-	mcpdrv->drv.remove = mcp_bus_remove;
 	return driver_register(&mcpdrv->drv);
 }
 EXPORT_SYMBOL(mcp_driver_register);