Merge ../master/

[oweals/u-boot.git] / board / amcc / taishan / taishan.c

diff --git a/board/amcc/taishan/taishan.c b/board/amcc/taishan/taishan.c
index 7e023711f9166bcba477e2818d8d7fb17c9d6390..f00397ed197936d00d69e3cf56b5cbca7570ea91 100644 (file)
--- a/board/amcc/taishan/taishan.c
+++ b/board/amcc/taishan/taishan.c
@@ -32,6 +32,8 @@
 void show_reset_reg(void);
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int lcd_init(void);
 
 int board_early_init_f (void)
@@ -164,7 +166,7 @@ int board_early_init_f (void)
 
        *GpioOdr &= ~(0x00300000);
        *GpioTcr |= 0x00300000;
-        *GpioOr  |= 0x00300000;
+       *GpioOr  |= 0x00300000;
 
        return 0;
 }
@@ -236,7 +238,7 @@ int testdram (void)
  *     certain pre-initialization actions.
  *
  ************************************************************************/
-#if defined(CONFIG_PCI) && defined(CFG_PCI_PRE_INIT)
+#if defined(CONFIG_PCI)
 int pci_pre_init(struct pci_controller * hose )
 {
        unsigned long strap;
@@ -253,7 +255,7 @@ int pci_pre_init(struct pci_controller * hose )
 
        return 1;
 }
-#endif /* defined(CONFIG_PCI) && defined(CFG_PCI_PRE_INIT) */
+#endif /* defined(CONFIG_PCI) */
 
 /*************************************************************************
  *  pci_target_init
@@ -266,8 +268,6 @@ int pci_pre_init(struct pci_controller * hose )
 #if defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT)
 void pci_target_init(struct pci_controller * hose )
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /*--------------------------------------------------------------------------+
         * Disable everything
         *--------------------------------------------------------------------------*/