diff options
| author | Russell King | 2010-07-01 11:16:00 +0200 |
|---|---|---|
| committer | Russell King | 2010-07-01 11:16:04 +0200 |
| commit | fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5 (patch) | |
| tree | 1d3f38534ab1ac7672d0c33e5c7328f4f2c07f6b /arch/arm/include | |
| parent | ARM: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU (diff) | |
| parent | [ARM] mmp: fix build failure due to IRQ_PMU depends on ARCH_PXA (diff) | |
| download | kernel-qcow2-linux-fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5.tar.gz kernel-qcow2-linux-fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5.tar.xz kernel-qcow2-linux-fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/mach/udc_pxa2xx.h | 4 |
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 */ }; |