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

[people/ms/u-boot.git] / include / configs / snapper9260.h

diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index b33bec94a06de2b63050a4aa21a630be0cbe3bcd..8bd580660d5ac1809fdc36d38afd398d7b808f31 100644 (file)
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -28,7 +28,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_DISPLAY_CPUINFO
 
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS           1
@@ -70,7 +69,6 @@
 #define CONFIG_SYS_USB_OHCI_REGS_BASE  ATMEL_UHP_BASE
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME  "at91sam9260"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-#define CONFIG_USB_STORAGE
 
 /* GPIOs and IO expander */
 #define CONFIG_ATMEL_LEGACY