Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / samsung / trats / trats.c

diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index f8b290800237dbfa5f7a32956657b6e5a59d5323..fec72d4c54223dfdd653809533addd934c7db3b1 100644 (file)
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -426,8 +426,7 @@ int board_usb_init(int index, enum usb_init_type init)
        return s3c_udc_probe(&s5pc210_otg_data);
 }
 
-#ifdef CONFIG_USB_CABLE_CHECK
-int usb_cable_connected(void)
+int g_dnl_board_usb_cable_connected(void)
 {
        struct pmic *muic = pmic_get("MAX8997_MUIC");
        if (!muic)
@@ -436,7 +435,6 @@ int usb_cable_connected(void)
        return !!muic->chrg->chrg_type(muic);
 }
 #endif
-#endif
 
 static void pmic_reset(void)
 {