diff options
author | Michal Simek <monstr@monstr.eu> | 2007-08-15 21:06:52 +0200 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2007-08-15 21:06:52 +0200 |
commit | 19909edb97140a5ea3139705589bb90e023ab5e1 (patch) | |
tree | 6629766d2355d3c01b96b0c5ee6b9fd73502c943 /include/asm-ppc/global_data.h | |
parent | d1ed28cf36ab6b1d4c479809de7252bf53d2f2d4 (diff) | |
parent | 210f463c71917b7a4495c2103c228b9c179ae64d (diff) | |
download | u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.zip u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.tar.gz u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.tar.bz2 |
Merge git://www.denx.de/git/u-boot into merge
Diffstat (limited to 'include/asm-ppc/global_data.h')
-rw-r--r-- | include/asm-ppc/global_data.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index bbaeb3f..1f1583a 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -71,16 +71,16 @@ typedef struct global_data { u32 lclk_clk; u32 ddr_clk; u32 pci_clk; +#if defined(CONFIG_MPC8360) + u32 ddr_sec_clk; +#endif /* CONFIG_MPC8360 */ +#endif #if defined(CONFIG_QE) u32 qe_clk; u32 brg_clk; uint mp_alloc_base; uint mp_alloc_top; #endif /* CONFIG_QE */ -#if defined (CONFIG_MPC8360) - u32 ddr_sec_clk; -#endif /* CONFIG_MPC8360 */ -#endif #if defined(CONFIG_MPC5xxx) unsigned long ipb_clk; unsigned long pci_clk; |