diff options
author | Peter Chen <peter.chen@freescale.com> | 2013-06-23 21:25:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-24 19:15:26 -0400 |
commit | 848d5b9121e52f63847bf9e156f836db001f51c7 (patch) | |
tree | 0b636a5203c4b1f77ec546550b838f84a19f296c | |
parent | f797d37ead9afc9b5586f02789819a8fb72a55fc (diff) |
usb: fix build error without CONFIG_USB_PHY
on i386:
drivers/built-in.o: In function `ci_hdrc_probe':
core.c:(.text+0x20446b): undefined reference to `of_usb_get_phy_mode'
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | include/linux/usb/of.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h index e460a24115ca..a0ef405368b8 100644 --- a/include/linux/usb/of.h +++ b/include/linux/usb/of.h | |||
@@ -10,19 +10,23 @@ | |||
10 | #include <linux/usb/otg.h> | 10 | #include <linux/usb/otg.h> |
11 | #include <linux/usb/phy.h> | 11 | #include <linux/usb/phy.h> |
12 | 12 | ||
13 | #ifdef CONFIG_OF | 13 | #if IS_ENABLED(CONFIG_OF) |
14 | enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np); | ||
15 | enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np); | 14 | enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np); |
16 | #else | 15 | #else |
17 | static inline enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np) | 16 | static inline enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np) |
18 | { | 17 | { |
19 | return USBPHY_INTERFACE_MODE_UNKNOWN; | 18 | return USB_DR_MODE_UNKNOWN; |
20 | } | 19 | } |
20 | #endif | ||
21 | 21 | ||
22 | static inline enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np) | 22 | #if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_PHY) |
23 | enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np); | ||
24 | #else | ||
25 | static inline enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np) | ||
23 | { | 26 | { |
24 | return USB_DR_MODE_UNKNOWN; | 27 | return USBPHY_INTERFACE_MODE_UNKNOWN; |
25 | } | 28 | } |
29 | |||
26 | #endif | 30 | #endif |
27 | 31 | ||
28 | #endif /* __LINUX_USB_OF_H */ | 32 | #endif /* __LINUX_USB_OF_H */ |