From fd53bfc09534cdd6f18b52379372fe8adf4b22a7 Mon Sep 17 00:00:00 2001
From: Marcus Cooper <marcus.xm.cooper@stericsson.com>
Date: Fri, 11 Jan 2013 13:13:03 +0000
Subject: [PATCH] --- yaml --- r: 350623 b: refs/heads/master c:
 377345c2be3afad0d5cd16b2340c0da876494f6d h: refs/heads/master i:   350621:
 554a86f32e25baea53a2ddfc9bc33958d7594075   350619:
 053b88dbbc160c23b222cd092bc9e1b32fe18cfe   350615:
 299ced2a8d9f70cb8badd6cde376114ab8ceeac6   350607:
 c95ecf724f62ecafa683e39c1a4c7d72e557a215   350591:
 850b27cfb5732ca7b0092032dd366b10d5772c94 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/power/ab8500_charger.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6159f9cf3a4a..920aa1623c71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bcf3b39a8776630eeec51aa1180626d66dc51aa
+refs/heads/master: 377345c2be3afad0d5cd16b2340c0da876494f6d
diff --git a/trunk/drivers/power/ab8500_charger.c b/trunk/drivers/power/ab8500_charger.c
index a0aeef2d2e05..6ba7efff81e8 100644
--- a/trunk/drivers/power/ab8500_charger.c
+++ b/trunk/drivers/power/ab8500_charger.c
@@ -115,11 +115,6 @@ enum ab8500_charger_link_status {
 	USB_STAT_CARKIT_1,
 	USB_STAT_CARKIT_2,
 	USB_STAT_ACA_DOCK_CHARGER,
-	USB_STAT_SAMSUNG_USB_PHY_DIS,
-	USB_STAT_SAMSUNG_USB_PHY_ENA,
-	USB_STAT_SAMSUNG_UART_PHY_DIS,
-	USB_STAT_SAMSUNG_UART_PHY_ENA,
-	USB_STAT_MOTOROLA_USB_PHY_ENA,
 };
 
 enum ab8500_usb_state {