diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-01-23 17:48:24 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-01-23 17:48:24 -0600 |
| commit | 833d94bcdc89cf88928be21587240950afdc33c8 (patch) | |
| tree | 52af90dbf1a442961c63ec0bbdd3d0bf643685ec /cpu/mpc83xx/speed.c | |
| parent | 6dadc9195ad642cc662632f4d92f92d3d71e8bf2 (diff) | |
| parent | 5bb907a4925397789c90d074f4f7e92ce6b39402 (diff) | |
| download | talos-obmc-uboot-833d94bcdc89cf88928be21587240950afdc33c8.tar.gz talos-obmc-uboot-833d94bcdc89cf88928be21587240950afdc33c8.zip | |
Merge branch 'next'
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 bf9bf36e5f..4230099c0c 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; |
