Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / watchdog / mpcore_wdt.c

diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 3c4f95599c65c7a968e6bb905d1bf156535b2e2f..2a9bfa81f9d60e9f385ced408fcc54e0a261f0e7 100644 (file)
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -377,13 +377,13 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
 
        return 0;
 
- err_irq:
+err_irq:
        misc_deregister(&mpcore_wdt_miscdev);
- err_misc:
+err_misc:
        iounmap(wdt->base);
- err_free:
+err_free:
        kfree(wdt);
- err_out:
+err_out:
        return ret;
 }