diff options
| author | Felipe Balbi <balbi@ti.com> | 2013-07-30 02:09:15 -0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-07-30 02:09:15 -0400 |
| commit | 9cf7b244187bba5964d4bf7438946baa2a974466 (patch) | |
| tree | abdcdd407be51463e3cbf49e1908b5ca20f3349b | |
| parent | 2e112345c22bcdf5d246db40f0587d7d11f1dc61 (diff) | |
usb: of: fix build breakage caused by recent patches
commit 052a11d (usb: phy: make PHY driver selection
possible by controller drivers) changed the rules
on how drivers/usb/phy/of.c would be compiled and
failed to update include/linux/usb/of.h accordingly.
Because of that, we can fall into situations where
of_usb_get_phy_mode() is redefined. In order to fix
the error, we update the IS_ENABLED() check in
include/linux/usb/of.h to reflect the condition
where of.c is built.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | include/linux/usb/of.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h index 5a7cb9ebf0ef..8c38aa26b3bb 100644 --- a/include/linux/usb/of.h +++ b/include/linux/usb/of.h | |||
| @@ -27,7 +27,7 @@ of_usb_get_maximum_speed(struct device_node *np) | |||
| 27 | } | 27 | } |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | #if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_PHY) | 30 | #if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_SUPPORT) |
| 31 | enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np); | 31 | enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np); |
| 32 | #else | 32 | #else |
| 33 | static inline enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np) | 33 | static inline enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np) |