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

[platform/kernel/u-boot.git] / include / configs / gr_ep2s60.h

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 956c0e2..265f03c 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -59,7 +59,6 @@
 /* USB support */
 #if USE_GRUSB
 #define CONFIG_USB_UHCI
-#define CONFIG_USB_STORAGE
 /* Enable needed helper functions */
 #define CONFIG_SYS_STDIO_DEREGISTER    /* needs stdio_deregister */
 #endif
@@ -67,7 +66,6 @@
 /*
  * Autobooting
  */
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */
 
 #define CONFIG_PREBOOT "echo;" \
        "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \