summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-26 11:03:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-26 11:03:03 +0100
commit938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (patch)
tree9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 /arch/arm/include/asm
parentMerge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... (diff)
parentARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path (diff)
downloadlinux-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.tar.xz
linux-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')
-rw-r--r--arch/arm/include/asm/mach/udc_pxa2xx.h2
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 */
};