aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/mach/udc_pxa2xx.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-03-31 15:39:47 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-03-31 15:39:47 +0900
commit7ea5db8efeac8627500e012aa6829ca612c5a700 (patch)
tree90e4de22f60b989dcf0f0d7436978c0b463d5827 /arch/arm/include/asm/mach/udc_pxa2xx.h
parenteee7631fdf8ae63c4f24daf66981ac1a7b55d7fd (diff)
parent6aba74f2791287ec407e0f92487a725a25908067 (diff)
downloadkernel_samsung_smdk4412-7ea5db8efeac8627500e012aa6829ca612c5a700.zip
kernel_samsung_smdk4412-7ea5db8efeac8627500e012aa6829ca612c5a700.tar.gz
kernel_samsung_smdk4412-7ea5db8efeac8627500e012aa6829ca612c5a700.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/arm/include/asm/mach/udc_pxa2xx.h')
-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 833306e..ea297ac 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 */
};