summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/mach
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2010-04-21 16:30:33 +1000
committerEric Miao <eric.y.miao@gmail.com>2010-06-13 23:55:12 +0800
commit390daa0d8f391378865221cd8446028884a3baa9 (patch)
treefc09502f949f95615881d840a545d9cd1e9611ee /arch/arm/include/asm/mach
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
[ARM] pxa: fix incorrect gpio type in udc_pxa2xx.h
gpio must be int, not u16, otherwise -1 isn't recognised by gpio_is_valid(). Signed-off-by: Steve Bennett <steveb@workware.net.au> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/include/asm/mach')
-rw-r--r--arch/arm/include/asm/mach/udc_pxa2xx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach/udc_pxa2xx.h b/arch/arm/include/asm/mach/udc_pxa2xx.h
index f3eabf1ecec3..833306ee9e7f 100644
--- a/arch/arm/include/asm/mach/udc_pxa2xx.h
+++ b/arch/arm/include/asm/mach/udc_pxa2xx.h
@@ -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 */
};