summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFelipe Balbi <felipe.balbi@nokia.com>2008-07-17 16:26:49 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2008-08-14 02:32:49 +0200
commite67d70f2f55d90c79dcb384ad5b798f0f9a68085 (patch)
tree5d767719406227aa7759f9c996e3956acc1264de /drivers
parentUSB: usb-storage: quirk around v1.11 firmware on Nikon D4 (diff)
downloadlinux-e67d70f2f55d90c79dcb384ad5b798f0f9a68085.tar.xz
linux-e67d70f2f55d90c79dcb384ad5b798f0f9a68085.zip
usb: gadget: protect gadget_chips.h from been included twice
Without it, we might have trouble when trying to write some composite gadget drivers. Cc: David Brownell <dbrownell@users.sourceforge.net> Cc: Greg KH <greg@kroah.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/gadget_chips.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 5246e8fef2b2..17d9905101b7 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -11,6 +11,10 @@
* Some are available on 2.4 kernels; several are available, but not
* yet pushed in the 2.6 mainline tree.
*/
+
+#ifndef __GADGET_CHIPS_H
+#define __GADGET_CHIPS_H
+
#ifdef CONFIG_USB_GADGET_NET2280
#define gadget_is_net2280(g) !strcmp("net2280", (g)->name)
#else
@@ -237,3 +241,5 @@ static inline bool gadget_supports_altsettings(struct usb_gadget *gadget)
/* Everything else is *presumably* fine ... */
return true;
}
+
+#endif /* __GADGET_CHIPS_H */