Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index d3ab10e7fa9cbedd67f8021970bac18d345b17f8..e9781ccf5f3be5163f21a2e0504982e3123c6b68 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -27,9 +27,7 @@
 #define CONFIG_MACH_TYPE               MACH_TYPE_HARMONY
 
 /* SD/MMC */
-#define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA_MMC
 
 /* NAND support */
 #define CONFIG_CMD_NAND
@@ -43,7 +41,6 @@
 /* USB Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_STORAGE
 
 /* USB networking support */
 #define CONFIG_USB_HOST_ETHER
@@ -55,7 +52,6 @@
 
 /* LCD support */
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES    10
 
 #include "tegra-common-post.h"