diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 10:03:03 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 10:03:03 +0000 |
| commit | 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (patch) | |
| tree | 9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 /arch/arm/include/asm/mach | |
| parent | Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 (diff) | |
| parent | ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path (diff) | |
| download | linux-dev-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.tar.xz linux-dev-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.zip | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/tosa.c
Diffstat (limited to 'arch/arm/include/asm/mach')
| -rw-r--r-- | arch/arm/include/asm/mach/udc_pxa2xx.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach/udc_pxa2xx.h b/arch/arm/include/asm/mach/udc_pxa2xx.h index 833306ee9e7f..ea297ac70bc6 100644 --- a/arch/arm/include/asm/mach/udc_pxa2xx.h +++ b/arch/arm/include/asm/mach/udc_pxa2xx.h @@ -20,8 +20,6 @@ struct pxa2xx_udc_mach_info { * VBUS IRQ and omit the methods above. Store the GPIO number * here. Note that sometimes the signals go through inverters... */ - bool gpio_vbus_inverted; - int gpio_vbus; /* high == vbus present */ bool gpio_pullup_inverted; int gpio_pullup; /* high == pullup activated */ }; |