summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc/global_data.h
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
committerStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
commitf2302d4430e7f3f48308d6a585320fe96af8afbd (patch)
treeeec529fa883a32b0bd44f65aa46a454dc5c69688 /include/asm-ppc/global_data.h
parent9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff)
downloadbootable_bootloader_goldelico_gta04-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip
bootable_bootloader_goldelico_gta04-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz
bootable_bootloader_goldelico_gta04-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.bz2
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/asm-ppc/global_data.h')
-rw-r--r--include/asm-ppc/global_data.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index c5ac658..be2ce24 100644
--- 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)