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

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

diff --git a/include/configs/intip.h b/include/configs/intip.h
index 3ecf47d866ce3ed8ab01d00819838115175655da..5c8b68dfa58a7418d04d9c760d83c5626f5da383 100644 (file)
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -40,7 +40,6 @@
 
 #define CONFIG_SYS_CLK_FREQ    66666667        /* external freq to pll */
 
-#define CONFIG_BOARD_EARLY_INIT_F      1       /* Call board_early_init_f */
 #define CONFIG_BOARD_EARLY_INIT_R      1       /* Call board_early_init_r */
 #define CONFIG_MISC_INIT_R             1       /* Call misc_init_r */
 #define CONFIG_BOARD_TYPES             1       /* support board types */
@@ -289,7 +288,6 @@
  */
 /* General PCI */
 #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_DISABLE_PCIE