aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-24 08:36:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-24 08:36:06 -0700
commitd72cd3a90e4d6725b62919139e2ab7bd926fa16d (patch)
tree771731ecee0ebdd60dcda2173945cff28edc8e71 /include/linux
parentff91fad2db543325d7221c26ff42d7df3c574064 (diff)
parent6b35ca0d3d586b8ecb8396821af21186e20afaf0 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: pwc : do not pass stack allocated buffers to USB core. USB: otg: Fix bug on remove path without transceiver USB: correct error handling in cdc-wdm USB: removal of tty->low_latency hack dating back to the old serial code USB: serial: sierra driver bug fix for composite interface USB: gadget: omap_udc uses platform_driver_probe() USB: ci13xxx_udc: fix build error USB: musb: Prevent multiple includes of musb.h USB: pass mem_flags to dma_alloc_coherent USB: g_file_storage: fix use-after-free bug when closing files USB: ehci-sched.c: EHCI SITD scheduling bugfix USB: fix mos7840 problem with minor numbers USB: mos7840: add new device id USB: musb: fix build when !CONFIG_PM USB: musb: Remove my email address from few musb related drivers USB: Gadget: MIPS CI13xxx UDC bugfixes USB: Unusual Device support for Gold MP3 Player Energy USB: serial: fix lifetime and locking problems
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/usb/musb.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index d6aad0ea603..d4375566926 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -7,6 +7,9 @@
* key configuration differences between boards.
*/
+#ifndef __LINUX_USB_MUSB_H
+#define __LINUX_USB_MUSB_H
+
/* The USB role is defined by the connector used on the board, so long as
* standards are being followed. (Developer boards sometimes won't.)
*/
@@ -101,3 +104,5 @@ extern int __init tusb6010_setup_interface(
extern int tusb6010_platform_retime(unsigned is_refclk);
#endif /* OMAP2 */
+
+#endif /* __LINUX_USB_MUSB_H */