Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git...

[~andy/linux] / drivers / usb / otg / twl6030-usb.c

diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index fcadef7864f12a11a36dbab5967315669a09c3b3..8cd6cf49bdbd12c987f871193e58be3f3df77853 100644 (file)
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -310,7 +310,7 @@ static int twl6030_set_vbus(struct phy_companion *comparator, bool enabled)
        return 0;
 }
 
-static int __devinit twl6030_usb_probe(struct platform_device *pdev)
+static int twl6030_usb_probe(struct platform_device *pdev)
 {
        u32 ret;
        struct twl6030_usb      *twl;