From 24faf3c3dbdd2fac28c4a0f79094ff7896ede0c2 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Wed, 6 Feb 2013 18:58:51 +0530 Subject: [PATCH] --- yaml --- r: 354723 b: refs/heads/master c: c8ce60bbed39a8d884837ed6e53dc32f7f86e40f h: refs/heads/master i: 354721: 9f7df14a5975a29513192f4d5a2bffb5aa33cc16 354719: 92e68d6a3ea2f65b2c959e46795384ba41167d20 v: v3 --- [refs] | 2 +- trunk/include/linux/usb/omap_control_usb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); }