diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 14:34:19 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 14:34:19 +0100 |
| commit | 879027daa838d245bf433ca2bb446bedace724f0 (patch) | |
| tree | 663792e944d667843d77f81dd3d5ab56ffa7f098 /include/asm-ppc/global_data.h | |
| parent | 93ef45c9ddfdd9fc17c4e74bd8e2f2456580eb72 (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/asm-ppc/global_data.h')
| -rw-r--r-- | include/asm-ppc/global_data.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index 26bc875f86..cd2463643c 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -55,11 +55,13 @@ typedef struct global_data { #if defined(CONFIG_MPC83XX) /* There are other clocks in the MPC83XX */ u32 csb_clk; -#if defined (CONFIG_MPC834X) +#if defined (CONFIG_MPC834X) || defined(CONFIG_MPC831X) u32 tsec1_clk; u32 tsec2_clk; - u32 usbmph_clk; u32 usbdr_clk; +#endif +#if defined (CONFIG_MPC834X) + u32 usbmph_clk; #endif /* CONFIG_MPC834X */ u32 core_clk; u32 i2c1_clk; |