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

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

diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index aac36b1cb5c1b4c7e0363991cf443fda06dc89bd..ca4d6ecaeef93203e5958b0de62e2ce1b76d5ca5 100644 (file)
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -47,7 +47,6 @@
 
 #define CONFIG_SYS_CLK_FREQ    66666667        /* external freq to pll */
 
-#define CONFIG_BOARD_EARLY_INIT_F              /* Call board_early_init_f */
 #define CONFIG_BOARD_EARLY_INIT_R              /* Call board_early_init_r */
 #define CONFIG_MISC_INIT_R                     /* Call misc_init_r */
 #define CONFIG_BOARD_TYPES                     /* support board types */
@@ -404,9 +403,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