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

[u-boot] / board / ixdp425 / ixdp425.c

diff --git a/board/ixdp425/ixdp425.c b/board/ixdp425/ixdp425.c
index eaf7cdefe566342f03d8703316172c010d2278a9..e0d763780e523c2942f79be1a32f7a5ba2d380c5 100644 (file)
--- a/board/ixdp425/ixdp425.c
+++ b/board/ixdp425/ixdp425.c
@@ -38,11 +38,6 @@ DECLARE_GLOBAL_DATA_PTR;
 /*
  * Miscelaneous platform dependent initialisations
  */
-int board_post_init (void)
-{
-       return (0);
-}
-
 int board_init (void)
 {
        /* arch number of IXDP */
@@ -112,7 +107,7 @@ int dram_init (void)
        return (0);
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCI) || defined(CONFIG_PCI)
+#if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
 extern struct pci_controller hose;
 extern void pci_ixp_init(struct pci_controller * hose);