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 {