Fix merge problems

[people/ms/u-boot.git] / include / asm-ppc / global_data.h

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index c5ac6584acb4c942e1f57ab481a0726ad304fb6d..be2ce2477827965ccbbfe8eeb6b30e42232be425 100644 (file)
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -51,6 +51,9 @@ typedef       struct  global_data {
        unsigned long   cpm_clk;
        unsigned long   scc_clk;
        unsigned long   brg_clk;
+#ifdef CONFIG_PCI
+       unsigned long   pci_clk;
+#endif
 #endif
        unsigned long   mem_clk;
 #if defined(CONFIG_MPC83XX)