diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:36 -0400 |
| commit | 5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64 (patch) | |
| tree | 7e3c7dd69ba19b41d11ff8f08f2906443a72a5e6 /include/asm-arm/mach/udc_pxa2xx.h | |
| parent | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (diff) | |
| parent | ac2536109849217a71510b6ded813e91629e88f6 (diff) | |
Merge branch 'eseries' into pxa
Conflicts:
arch/arm/mach-pxa/Makefile
Diffstat (limited to 'include/asm-arm/mach/udc_pxa2xx.h')
| -rw-r--r-- | include/asm-arm/mach/udc_pxa2xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/mach/udc_pxa2xx.h b/include/asm-arm/mach/udc_pxa2xx.h index f9f3606986c2..9e5ed7c0f27f 100644 --- a/include/asm-arm/mach/udc_pxa2xx.h +++ b/include/asm-arm/mach/udc_pxa2xx.h | |||
| @@ -23,6 +23,7 @@ struct pxa2xx_udc_mach_info { | |||
| 23 | */ | 23 | */ |
| 24 | bool gpio_vbus_inverted; | 24 | bool gpio_vbus_inverted; |
| 25 | u16 gpio_vbus; /* high == vbus present */ | 25 | u16 gpio_vbus; /* high == vbus present */ |
| 26 | bool gpio_pullup_inverted; | ||
| 26 | u16 gpio_pullup; /* high == pullup activated */ | 27 | u16 gpio_pullup; /* high == pullup activated */ |
| 27 | }; | 28 | }; |
| 28 | 29 | ||