diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /include/linux/usb/otg.h | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'include/linux/usb/otg.h')
| -rw-r--r-- | include/linux/usb/otg.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 545cba73ccaf..0a5b3711e502 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h | |||
| @@ -164,8 +164,19 @@ otg_shutdown(struct otg_transceiver *otg) | |||
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | /* for usb host and peripheral controller drivers */ | 166 | /* for usb host and peripheral controller drivers */ |
| 167 | #ifdef CONFIG_USB_OTG_UTILS | ||
| 167 | extern struct otg_transceiver *otg_get_transceiver(void); | 168 | extern struct otg_transceiver *otg_get_transceiver(void); |
| 168 | extern void otg_put_transceiver(struct otg_transceiver *); | 169 | extern void otg_put_transceiver(struct otg_transceiver *); |
| 170 | #else | ||
| 171 | static inline struct otg_transceiver *otg_get_transceiver(void) | ||
| 172 | { | ||
| 173 | return NULL; | ||
| 174 | } | ||
| 175 | |||
| 176 | static inline void otg_put_transceiver(struct otg_transceiver *x) | ||
| 177 | { | ||
| 178 | } | ||
| 179 | #endif | ||
| 169 | 180 | ||
| 170 | /* Context: can sleep */ | 181 | /* Context: can sleep */ |
| 171 | static inline int | 182 | static inline int |