Merge branch 'origin' into misc
This commit is contained in:
@@ -21,8 +21,8 @@ struct pxa2xx_udc_mach_info {
|
||||
* here. Note that sometimes the signals go through inverters...
|
||||
*/
|
||||
bool gpio_vbus_inverted;
|
||||
u16 gpio_vbus; /* high == vbus present */
|
||||
int gpio_vbus; /* high == vbus present */
|
||||
bool gpio_pullup_inverted;
|
||||
u16 gpio_pullup; /* high == pullup activated */
|
||||
int gpio_pullup; /* high == pullup activated */
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user