From 6fc5b7f078d37a556b4debaba48fb53081efc891 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.miao@marvell.com>
Date: Fri, 18 Jul 2008 08:51:07 +0800
Subject: [PATCH] --- yaml --- r: 112401 b: refs/heads/master c:
 1730aadffb6ec3c4fe4d69a68f2f9445fd1b1264 h: refs/heads/master i:   112399:
 2bb9af84f025e323a5f10b43750a2b33c53fbebc v: v3

---
 [refs]                           |  2 +-
 trunk/arch/arm/mach-pxa/poodle.c | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 1929c739499d..e91ab3356abe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b0defd4c17f65fcfef758b8f3a811287eba73de
+refs/heads/master: 1730aadffb6ec3c4fe4d69a68f2f9445fd1b1264
diff --git a/trunk/arch/arm/mach-pxa/poodle.c b/trunk/arch/arm/mach-pxa/poodle.c
index e85eba3e362d..cbcf394d84d1 100644
--- a/trunk/arch/arm/mach-pxa/poodle.c
+++ b/trunk/arch/arm/mach-pxa/poodle.c
@@ -280,21 +280,9 @@ static struct pxaficp_platform_data poodle_ficp_platform_data = {
 /*
  * USB Device Controller
  */
-static void poodle_udc_command(int cmd)
-{
-	switch(cmd)	{
-	case PXA2XX_UDC_CMD_CONNECT:
-		GPSR(POODLE_GPIO_USB_PULLUP) = GPIO_bit(POODLE_GPIO_USB_PULLUP);
-		break;
-	case PXA2XX_UDC_CMD_DISCONNECT:
-		GPCR(POODLE_GPIO_USB_PULLUP) = GPIO_bit(POODLE_GPIO_USB_PULLUP);
-		break;
-	}
-}
-
 static struct pxa2xx_udc_mach_info udc_info __initdata = {
 	/* no connect GPIO; poodle can't tell connection status */
-	.udc_command		= poodle_udc_command,
+	.gpio_pullup	= POODLE_GPIO_USB_PULLUP,
 };