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

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

diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h
index 375515e1c4669b22001bbda322fd93463ad34921..345e6d6db4d206742e5d3409b919748fc7767ae3 100644 (file)
--- a/include/configs/pxa-common.h
+++ b/include/configs/pxa-common.h
@@ -9,7 +9,6 @@
 #ifndef        __CONFIG_PXA_COMMON_H__
 #define        __CONFIG_PXA_COMMON_H__
 
-#define        CONFIG_DISPLAY_CPUINFO
 #define        CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 
 /*
@@ -23,10 +22,7 @@
  * MMC Card Configuration
  */
 #ifdef CONFIG_CMD_MMC
-#define        CONFIG_MMC
-#define        CONFIG_GENERIC_MMC
 #define        CONFIG_PXA_MMC_GENERIC
-#define        CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -43,7 +39,6 @@
 #endif
 #define        CONFIG_SYS_USB_OHCI_REGS_BASE           0x4c000000
 #define        CONFIG_SYS_USB_OHCI_SLOT_NAME           "pxa-ohci"
-#define        CONFIG_USB_STORAGE
 #endif
 
 #endif /* __CONFIG_PXA_COMMON_H__ */