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

[u-boot] / include / configs / icon.h

diff --git a/include/configs/icon.h b/include/configs/icon.h
index c38a254a66c37c1a5b7367043627dc84f8e40510..b15016b5a343c6777b4e01bce6a67045e3771bef 100644 (file)
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -133,8 +133,6 @@
 #define CONFIG_VIDEO_SM501_PCI
 #define VIDEO_FB_LITTLE_ENDIAN
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CFG_CONSOLE_IS_IN_ENV
@@ -208,9 +206,7 @@
  * PCI stuff
  */
 /* General PCI */
-#define CONFIG_PCI                     /* include pci support          */
 #define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP                 /* do pci plug-and-play         */
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup  */
 #define CONFIG_PCI_CONFIG_HOST_BRIDGE
 #define CONFIG_PCI_BOOTDELAY   1000    /* enable pci bootdelay variable*/