diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-05-08 00:32:35 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-05-08 00:32:35 +0200 |
| commit | 3c4bd60de15d79ddfc0cf3170a55847b2025d93f (patch) | |
| tree | 891b84b58f13a5f45536a243585b9d94c253a410 /lib_avr32/avr32_linux.c | |
| parent | fb05f6da35ea1c15c553abe6f23f656bf18dc5db (diff) | |
| parent | ac4cd59d59c9bf3f89cb7a344abf8184d678f562 (diff) | |
Merge git://www.denx.de/git/u-boot
Conflicts:
include/asm-microblaze/microblaze_intc.h
include/linux/stat.h
Diffstat (limited to 'lib_avr32/avr32_linux.c')
| -rw-r--r-- | lib_avr32/avr32_linux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib_avr32/avr32_linux.c b/lib_avr32/avr32_linux.c index d128dfb53f..6095e2ff21 100644 --- a/lib_avr32/avr32_linux.c +++ b/lib_avr32/avr32_linux.c @@ -27,7 +27,7 @@ #include <asm/addrspace.h> #include <asm/io.h> #include <asm/setup.h> -#include <asm/arch/platform.h> +#include <asm/arch/clk.h> DECLARE_GLOBAL_DATA_PTR; @@ -133,7 +133,7 @@ static struct tag *setup_clock_tags(struct tag *params) params->hdr.size = tag_size(tag_clock); params->u.clock.clock_id = ACLOCK_HSB; params->u.clock.clock_flags = 0; - params->u.clock.clock_hz = pm_get_clock_freq(CLOCK_HSB); + params->u.clock.clock_hz = get_hsb_clk_rate(); #endif return tag_next(params); |