diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-14 09:53:38 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-14 09:53:38 +0200 |
| commit | bf9583e544e867b0b49d72d74644a13486d68123 (patch) | |
| tree | 9ea8eb066af58692102f9eebab6cd9f7466d37c4 /include/asm-ppc/global_data.h | |
| parent | 85eb5caf6b906f7ec5b54814e8c7c74f55986bb7 (diff) | |
| parent | 7f3f2bd2dc08e0b05e185662ca2e2d283757104a (diff) | |
| download | u-boot-imx-bf9583e544e867b0b49d72d74644a13486d68123.zip u-boot-imx-bf9583e544e867b0b49d72d74644a13486d68123.tar.gz u-boot-imx-bf9583e544e867b0b49d72d74644a13486d68123.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc85xx
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; |