w1: fix omap 1-wire driver compilation

[safe/jmp/linux-2.6] / drivers / regulator / wm831x-ldo.c

diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 902db56..e686cdb 100644 (file)
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -19,6 +19,7 @@
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
+#include <linux/slab.h>
 
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/regulator.h>
@@ -371,6 +372,8 @@ static __devexit int wm831x_gp_ldo_remove(struct platform_device *pdev)
        struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
        struct wm831x *wm831x = ldo->wm831x;
 
+       platform_set_drvdata(pdev, NULL);
+
        wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "UV"), ldo);
        regulator_unregister(ldo->regulator);
        kfree(ldo);
@@ -383,6 +386,7 @@ static struct platform_driver wm831x_gp_ldo_driver = {
        .remove = __devexit_p(wm831x_gp_ldo_remove),
        .driver         = {
                .name   = "wm831x-ldo",
+               .owner  = THIS_MODULE,
        },
 };
 
@@ -470,7 +474,7 @@ static unsigned int wm831x_aldo_get_mode(struct regulator_dev *rdev)
        struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
        struct wm831x *wm831x = ldo->wm831x;
        int on_reg = ldo->base + WM831X_LDO_ON_CONTROL;
-       unsigned int ret;
+       int ret;
 
        ret = wm831x_reg_read(wm831x, on_reg);
        if (ret < 0)
@@ -640,6 +644,7 @@ static struct platform_driver wm831x_aldo_driver = {
        .remove = __devexit_p(wm831x_aldo_remove),
        .driver         = {
                .name   = "wm831x-aldo",
+               .owner  = THIS_MODULE,
        },
 };
 
@@ -811,6 +816,7 @@ static struct platform_driver wm831x_alive_ldo_driver = {
        .remove = __devexit_p(wm831x_alive_ldo_remove),
        .driver         = {
                .name   = "wm831x-alive-ldo",
+               .owner  = THIS_MODULE,
        },
 };