diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-22 21:47:29 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-22 21:47:29 -0700 |
| commit | bd072111e7319d90a7b8127f91c2806b9a6f279e (patch) | |
| tree | 1686978814a2387ebfc16f9f5778a7f0caaf319b /include/linux/usb/otg.h | |
| parent | Input: sh_keysc - allow modifying keymap from userspace (diff) | |
| parent | Linux 2.6.31-rc4 (diff) | |
| download | linux-dev-bd072111e7319d90a7b8127f91c2806b9a6f279e.tar.xz linux-dev-bd072111e7319d90a7b8127f91c2806b9a6f279e.zip | |
Merge commit 'v2.6.31-rc4' into next
Diffstat (limited to 'include/linux/usb/otg.h')
| -rw-r--r-- | include/linux/usb/otg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 1aaa826396a1..2443c0e7a80c 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -80,10 +80,10 @@ struct otg_transceiver { /* for board-specific init logic */ extern int otg_set_transceiver(struct otg_transceiver *); -#ifdef CONFIG_NOP_USB_XCEIV + +/* sometimes transceivers are accessed only through e.g. ULPI */ extern void usb_nop_xceiv_register(void); extern void usb_nop_xceiv_unregister(void); -#endif /* for usb host and peripheral controller drivers */ |