From b3e8fa7df2b55ae6fd27ffbc5fcc8b61afb46e0d Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Mon, 14 Feb 2011 15:33:20 +0300
Subject: [PATCH] --- yaml --- r: 243464 b: refs/heads/master c:
 1014cc38280f29ea0a39ec9a853fa0c3fdfebc7c h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/include/asm/mach/udc_pxa2xx.h | 2 --
 trunk/arch/arm/mach-pxa/corgi.c              | 1 -
 trunk/arch/arm/mach-pxa/devices.c            | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0b28a6dfeb80..df05853f4bde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8ecc860ef117f9405758d8d1378553afcdd9ca3
+refs/heads/master: 1014cc38280f29ea0a39ec9a853fa0c3fdfebc7c
diff --git a/trunk/arch/arm/include/asm/mach/udc_pxa2xx.h b/trunk/arch/arm/include/asm/mach/udc_pxa2xx.h
index 833306ee9e7f..ea297ac70bc6 100644
--- a/trunk/arch/arm/include/asm/mach/udc_pxa2xx.h
+++ b/trunk/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 */
 };
diff --git a/trunk/arch/arm/mach-pxa/corgi.c b/trunk/arch/arm/mach-pxa/corgi.c
index a5452a3a276d..002be002d1a0 100644
--- a/trunk/arch/arm/mach-pxa/corgi.c
+++ b/trunk/arch/arm/mach-pxa/corgi.c
@@ -462,7 +462,6 @@ static struct pxaficp_platform_data corgi_ficp_platform_data = {
  * USB Device Controller
  */
 static struct pxa2xx_udc_mach_info udc_info __initdata = {
-	.gpio_vbus		= -1,
 	/* no connect GPIO; corgi can't tell connection status */
 	.gpio_pullup		= CORGI_GPIO_USB_PULLUP,
 };
diff --git a/trunk/arch/arm/mach-pxa/devices.c b/trunk/arch/arm/mach-pxa/devices.c
index edfe80308902..8dcc92b33177 100644
--- a/trunk/arch/arm/mach-pxa/devices.c
+++ b/trunk/arch/arm/mach-pxa/devices.c
@@ -90,7 +90,6 @@ void __init pxa_set_mci_info(struct pxamci_platform_data *info)
 
 static struct pxa2xx_udc_mach_info pxa_udc_info = {
 	.gpio_pullup = -1,
-	.gpio_vbus   = -1,
 };
 
 void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)