diff options
author | Wolfgang Denk <wd@denx.de> | 2009-01-24 02:08:31 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-01-24 02:08:31 +0100 |
commit | 1ea0823786eb3bbb604da88279eca3ba31ef205f (patch) | |
tree | ac69be8ff94f90369999b83f0fdb9ac5c605daf5 /cpu/mpc83xx/speed.c | |
parent | 24113a44ed5cd3257a0237c3961e121812fca6db (diff) | |
parent | 833d94bcdc89cf88928be21587240950afdc33c8 (diff) | |
download | u-boot-imx-1ea0823786eb3bbb604da88279eca3ba31ef205f.zip u-boot-imx-1ea0823786eb3bbb604da88279eca3ba31ef205f.tar.gz u-boot-imx-1ea0823786eb3bbb604da88279eca3ba31ef205f.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'cpu/mpc83xx/speed.c')
-rw-r--r-- | cpu/mpc83xx/speed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc83xx/speed.c b/cpu/mpc83xx/speed.c index bf9bf36..4230099 100644 --- a/cpu/mpc83xx/speed.c +++ b/cpu/mpc83xx/speed.c @@ -132,7 +132,7 @@ int get_clocks(void) u32 qe_clk; u32 brg_clk; #endif -#if defined(CONFIG_MPC837X) +#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC831X) u32 pciexp1_clk; u32 pciexp2_clk; #endif @@ -328,7 +328,7 @@ int get_clocks(void) i2c2_clk = csb_clk; /* i2c-2 clk is equal to csb clk */ #endif -#if defined(CONFIG_MPC837X) +#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC831X) switch ((sccr & SCCR_PCIEXP1CM) >> SCCR_PCIEXP1CM_SHIFT) { case 0: pciexp1_clk = 0; |