diff --git a/[refs] b/[refs] index 805acf97c699..d3ed180550a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51482be9dcfdd0e46aa3b3b3775efe7044c94f38 +refs/heads/master: c8ce60bbed39a8d884837ed6e53dc32f7f86e40f diff --git a/trunk/include/linux/usb/omap_control_usb.h b/trunk/include/linux/usb/omap_control_usb.h index f306db7149ca..27b5b8c931b0 100644 --- a/trunk/include/linux/usb/omap_control_usb.h +++ b/trunk/include/linux/usb/omap_control_usb.h @@ -70,7 +70,7 @@ extern void omap_control_usb3_phy_power(struct device *dev, bool on); extern void omap_control_usb_set_mode(struct device *dev, enum omap_control_usb_mode mode); #else -static inline struct device *omap_get_control_dev() +static inline struct device *omap_get_control_dev(void) { return ERR_PTR(-ENODEV); }