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

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 4ed524b..29f9522 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -346,7 +346,6 @@
 
 #define CONFIG_LOADADDR         200000         /* default addr for tftp & bootm*/
 
-#define CONFIG_BOOTDELAY 1             /* -1 disables auto-boot        */
 
 #define CONFIG_PREBOOT "echo;" \
        "echo Welcome on the ABB Socrates Board;" \
@@ -421,6 +420,5 @@
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME          "ohci_pci"
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS        1
 #define CONFIG_DOS_PARTITION           1
-#define CONFIG_USB_STORAGE             1
 
 #endif /* __CONFIG_H */