git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull misc2-6-36 into release branch
[sfrench/cifs-2.6.git]
/
drivers
/
usb
/
gadget
/
pxa27x_udc.c
diff --git
a/drivers/usb/gadget/pxa27x_udc.c
b/drivers/usb/gadget/pxa27x_udc.c
index 85b0d8921eae4fbfe14c86c1ac7bf1f9ffae3705..980762453a9c293d6bdda38bdc54317c55a3433c 100644
(file)
--- a/
drivers/usb/gadget/pxa27x_udc.c
+++ b/
drivers/usb/gadget/pxa27x_udc.c
@@
-2561,7
+2561,7
@@
static void pxa_udc_shutdown(struct platform_device *_dev)
udc_disable(udc);
}
-#ifdef CONFIG_
CPU_
PXA27x
+#ifdef CONFIG_PXA27x
extern void pxa27x_clear_otgph(void);
#else
#define pxa27x_clear_otgph() do {} while (0)