diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-15 02:21:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-15 02:21:30 -0500 |
| commit | 6a54aebf6978e9f296a4d3da3e40af425163c22e (patch) | |
| tree | 8217c7114db02d8b69c22fc44880749426949bc3 /arch/arm/mach-pxa/colibri-pxa320.c | |
| parent | 067491b7313c41f49607fce782d29344d1472587 (diff) | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
Merge commit 'v3.2-rc5' into sched/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa320.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa320.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c index 692e1ffc5586..d23b92b80488 100644 --- a/arch/arm/mach-pxa/colibri-pxa320.c +++ b/arch/arm/mach-pxa/colibri-pxa320.c | |||
| @@ -146,7 +146,7 @@ static void __init colibri_pxa320_init_eth(void) | |||
| 146 | static inline void __init colibri_pxa320_init_eth(void) {} | 146 | static inline void __init colibri_pxa320_init_eth(void) {} |
| 147 | #endif /* CONFIG_AX88796 */ | 147 | #endif /* CONFIG_AX88796 */ |
| 148 | 148 | ||
| 149 | #if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE) | 149 | #if defined(CONFIG_USB_PXA27X)||defined(CONFIG_USB_PXA27X_MODULE) |
| 150 | static struct gpio_vbus_mach_info colibri_pxa320_gpio_vbus_info = { | 150 | static struct gpio_vbus_mach_info colibri_pxa320_gpio_vbus_info = { |
| 151 | .gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96), | 151 | .gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96), |
| 152 | .gpio_pullup = -1, | 152 | .gpio_pullup = -1, |