3 files changed, 8 insertions, 8 deletions

diff --git a/arch/x86/platform/olpc/olpc-xo1.c b/arch/x86/platform/olpc/olpc-xo1.c
index f4155354a7b..99513642a0e 100644
--- a/arch/x86/platform/olpc/olpc-xo1.c
+++ b/arch/x86/platform/olpc/olpc-xo1.c
@@ -63,7 +63,7 @@ static int __devinit olpc_xo1_probe(struct platform_device *pdev)
         if (!machine_is_olpc())
                 return -ENODEV;
 
-        err = mfd_shared_cell_enable(pdev);
+        err = mfd_cell_enable(pdev);
         if (err)
                 return err;
 
@@ -88,7 +88,7 @@ static int __devinit olpc_xo1_probe(struct platform_device *pdev)
 
 static int __devexit olpc_xo1_remove(struct platform_device *pdev)
 {
-        mfd_shared_cell_disable(pdev);
+        mfd_cell_disable(pdev);
 
         if (strcmp(pdev->name, "olpc-xo1-pms") == 0)
                 pms_base = 0;
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index bb2264cc410..79eda0264fb 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -18,7 +18,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 
-int mfd_shared_cell_enable(struct platform_device *pdev)
+int mfd_cell_enable(struct platform_device *pdev)
 {
         const struct mfd_cell *cell = mfd_get_cell(pdev);
         int err = 0;
@@ -33,9 +33,9 @@ int mfd_shared_cell_enable(struct platform_device *pdev)
 
         return err;
 }
-EXPORT_SYMBOL(mfd_shared_cell_enable);
+EXPORT_SYMBOL(mfd_cell_enable);
 
-int mfd_shared_cell_disable(struct platform_device *pdev)
+int mfd_cell_disable(struct platform_device *pdev)
 {
         const struct mfd_cell *cell = mfd_get_cell(pdev);
         int err = 0;
@@ -53,7 +53,7 @@ int mfd_shared_cell_disable(struct platform_device *pdev)
 
         return err;
 }
-EXPORT_SYMBOL(mfd_shared_cell_disable);
+EXPORT_SYMBOL(mfd_cell_disable);
 
 static int mfd_add_device(struct device *parent, int id,
                           const struct mfd_cell *cell,
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index ed9970412cc..1408bf8eed5 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -59,8 +59,8 @@ struct mfd_cell {
  * being called only when a device is first being enabled or no other
  * clients are making use of it.
  */
-extern int mfd_shared_cell_enable(struct platform_device *pdev);
-extern int mfd_shared_cell_disable(struct platform_device *pdev);
+extern int mfd_cell_enable(struct platform_device *pdev);
+extern int mfd_cell_disable(struct platform_device *pdev);
 
 /*
  * Given a platform device that's been created by mfd_add_devices(), fetch