diff options
| author | Stefan Roese <sr@denx.de> | 2007-05-18 11:20:02 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-05-18 11:20:02 +0200 |
| commit | ee96088ca59d871ec096aefce04b741d1b02cb30 (patch) | |
| tree | 6a97720507c4bbd57ec5f6a8faf09e0971e5449d /include/asm-ppc/global_data.h | |
| parent | ada4697d0230d6da552867777f98a67ec3ba2579 (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; |