diff options
author | Felipe Balbi <felipe.balbi@nokia.com> | 2008-07-17 10:26:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-13 20:32:49 -0400 |
commit | e67d70f2f55d90c79dcb384ad5b798f0f9a68085 (patch) | |
tree | 5d767719406227aa7759f9c996e3956acc1264de /drivers | |
parent | b9a097f26e55968cbc52e30a4a2e73d32d7604ce (diff) |
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.h | 6 |
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 @@ | |||
11 | * Some are available on 2.4 kernels; several are available, but not | 11 | * Some are available on 2.4 kernels; several are available, but not |
12 | * yet pushed in the 2.6 mainline tree. | 12 | * yet pushed in the 2.6 mainline tree. |
13 | */ | 13 | */ |
14 | |||
15 | #ifndef __GADGET_CHIPS_H | ||
16 | #define __GADGET_CHIPS_H | ||
17 | |||
14 | #ifdef CONFIG_USB_GADGET_NET2280 | 18 | #ifdef CONFIG_USB_GADGET_NET2280 |
15 | #define gadget_is_net2280(g) !strcmp("net2280", (g)->name) | 19 | #define gadget_is_net2280(g) !strcmp("net2280", (g)->name) |
16 | #else | 20 | #else |
@@ -237,3 +241,5 @@ static inline bool gadget_supports_altsettings(struct usb_gadget *gadget) | |||
237 | /* Everything else is *presumably* fine ... */ | 241 | /* Everything else is *presumably* fine ... */ |
238 | return true; | 242 | return true; |
239 | } | 243 | } |
244 | |||
245 | #endif /* __GADGET_CHIPS_H */ | ||