diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /arch/arm/include/asm/mach | |
| parent | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (diff) | |
| parent | fda50a1c49ad7483eaa29a268d560422c413933f (diff) | |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/include/asm/mach')
| -rw-r--r-- | arch/arm/include/asm/mach/udc_pxa2xx.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach/udc_pxa2xx.h b/arch/arm/include/asm/mach/udc_pxa2xx.h index 270902c353fd..f3eabf1ecec3 100644 --- a/arch/arm/include/asm/mach/udc_pxa2xx.h +++ b/arch/arm/include/asm/mach/udc_pxa2xx.h | |||
| @@ -18,8 +18,7 @@ struct pxa2xx_udc_mach_info { | |||
| 18 | /* Boards following the design guidelines in the developer's manual, | 18 | /* Boards following the design guidelines in the developer's manual, |
| 19 | * with on-chip GPIOs not Lubbock's weird hardware, can have a sane | 19 | * with on-chip GPIOs not Lubbock's weird hardware, can have a sane |
| 20 | * VBUS IRQ and omit the methods above. Store the GPIO number | 20 | * VBUS IRQ and omit the methods above. Store the GPIO number |
| 21 | * here; for GPIO 0, also mask in one of the pxa_gpio_mode() bits. | 21 | * here. Note that sometimes the signals go through inverters... |
| 22 | * Note that sometimes the signals go through inverters... | ||
| 23 | */ | 22 | */ |
| 24 | bool gpio_vbus_inverted; | 23 | bool gpio_vbus_inverted; |
| 25 | u16 gpio_vbus; /* high == vbus present */ | 24 | u16 gpio_vbus; /* high == vbus present */ |