git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into x86/urgent
[pandora-kernel.git]
/
drivers
/
usb
/
gadget
/
gadget_chips.h
diff --git
a/drivers/usb/gadget/gadget_chips.h
b/drivers/usb/gadget/gadget_chips.h
index
53e9139
..
ca5149e
100644
(file)
--- a/
drivers/usb/gadget/gadget_chips.h
+++ b/
drivers/usb/gadget/gadget_chips.h
@@
-17,14
+17,20
@@
#define gadget_is_net2280(g) 0
#endif
#define gadget_is_net2280(g) 0
#endif
+#ifdef CONFIG_USB_GADGET_AMD5536UDC
+#define gadget_is_amd5536udc(g) !strcmp("amd5536udc", (g)->name)
+#else
+#define gadget_is_amd5536udc(g) 0
+#endif
+
#ifdef CONFIG_USB_GADGET_DUMMY_HCD
#define gadget_is_dummy(g) !strcmp("dummy_udc", (g)->name)
#else
#define gadget_is_dummy(g) 0
#endif
#ifdef CONFIG_USB_GADGET_DUMMY_HCD
#define gadget_is_dummy(g) !strcmp("dummy_udc", (g)->name)
#else
#define gadget_is_dummy(g) 0
#endif
-#ifdef CONFIG_USB_GADGET_PXA2
X
X
-#define gadget_is_pxa(g) !strcmp("pxa2
x
x_udc", (g)->name)
+#ifdef CONFIG_USB_GADGET_PXA2
5
X
+#define gadget_is_pxa(g) !strcmp("pxa2
5
x_udc", (g)->name)
#else
#define gadget_is_pxa(g) 0
#endif
#else
#define gadget_is_pxa(g) 0
#endif
@@
-202,7
+208,9
@@
static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
return 0x18;
else if (gadget_is_fsl_usb2(gadget))
return 0x19;
return 0x18;
else if (gadget_is_fsl_usb2(gadget))
return 0x19;
- else if (gadget_is_
m66592
(gadget))
+ else if (gadget_is_
amd5536udc
(gadget))
return 0x20;
return 0x20;
+ else if (gadget_is_m66592(gadget))
+ return 0x21;
return -ENOENT;
}
return -ENOENT;
}