diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-05-16 01:12:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-05-16 01:12:04 +0200 |
| commit | 256176d3d5462d466e2c8434281ced50257c8add (patch) | |
| tree | df286b05bb197dfd92308258bd723aeef3581f90 /include/asm-ppc/global_data.h | |
| parent | d62f64cc23a940eafe712c776b3249e4160753d1 (diff) | |
| parent | 068aab660bc3912b930be5540e6b3f3fd6ad3c96 (diff) | |
| download | u-boot-imx-256176d3d5462d466e2c8434281ced50257c8add.zip u-boot-imx-256176d3d5462d466e2c8434281ced50257c8add.tar.gz u-boot-imx-256176d3d5462d466e2c8434281ced50257c8add.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx
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; |