Merge branch 'master' of git://git.denx.de/u-boot-imx

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

diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c
index d502f02d3dac2a339a099734ac541fd2f7365e2c..99a2facd1ee71f00945c01d5774d7d00e955c832 100644 (file)
--- a/board/samsung/origen/origen.c
+++ b/board/samsung/origen/origen.c
@@ -6,8 +6,8 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/gpio.h>
 #include <asm/arch/cpu.h>
-#include <asm/arch/gpio.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/periph.h>
 #include <asm/arch/pinmux.h>
@@ -30,13 +30,6 @@ int board_usb_init(int index, enum usb_init_type init)
        return 0;
 }
 
-#ifdef CONFIG_USB_CABLE_CHECK
-int usb_cable_connected(void)
-{
-       return 0;
-}
-#endif
-
 #ifdef CONFIG_BOARD_EARLY_INIT_F
 int exynos_early_init_f(void)
 {