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 'topic/caiaq' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
devices.c
diff --git
a/arch/arm/mach-pxa/devices.c
b/arch/arm/mach-pxa/devices.c
index
d245e59
..
29970f7
100644
(file)
--- a/
arch/arm/mach-pxa/devices.c
+++ b/
arch/arm/mach-pxa/devices.c
@@
-72,7
+72,10
@@
void __init pxa_set_mci_info(struct pxamci_platform_data *info)
}
}
-static struct pxa2xx_udc_mach_info pxa_udc_info;
+static struct pxa2xx_udc_mach_info pxa_udc_info = {
+ .gpio_pullup = -1,
+ .gpio_vbus = -1,
+};
void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)
{
void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)
{