diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 13:33:23 (GMT) |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 13:33:23 (GMT) |
| commit | fdda367561f0f6fb21d5b575402c0f9d2fd08e76 (patch) | |
| tree | afb703e6e43ff91e6f456f12fbb43fb598373fd5 /include/asm-ppc/global_data.h | |
| parent | 1443a31457d68f7e8f0b9403e9832ec1e79dc59d (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
| download | u-boot-fdda367561f0f6fb21d5b575402c0f9d2fd08e76.tar.xz | |
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 26bc875..cd24636 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; |