Merge commit 'v2.6.33-rc2' into for-2.6.33

[karo-tx-linux.git] / drivers / power / wm831x_backup.c

diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c
index f181076a40858355452dc25f5683973cec65f446..bf4f387a80098a33c1ed1186473d994e70271e7a 100644 (file)
--- a/drivers/power/wm831x_backup.c
+++ b/drivers/power/wm831x_backup.c
@@ -164,7 +164,7 @@ static __devinit int wm831x_backup_probe(struct platform_device *pdev)
        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
        struct wm831x_backup *devdata;
        struct power_supply *backup;
-       int ret, irq, i;
+       int ret;
 
        devdata = kzalloc(sizeof(struct wm831x_backup), GFP_KERNEL);
        if (devdata == NULL)