diff options
author | Mike Frysinger <michael.frysinger@analog.com> | 2007-10-21 22:55:35 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-10-21 22:55:35 -0400 |
commit | da27abb79970e80904818e3866703ed02953a174 (patch) | |
tree | 63cfb7af6b4fcf5edb042f8c0b75b8eb4126822f /arch | |
parent | 55b70a0300b873c0ec7ea6e33752af56f41250ce (diff) |
Blackfin arch: Javier Herrer writes: fix building when icache and dcache is disabled
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 0e746449c29b..f1b059e5a06c 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -501,7 +501,7 @@ EXPORT_SYMBOL(sclk_to_usecs); | |||
501 | 501 | ||
502 | unsigned long usecs_to_sclk(unsigned long usecs) | 502 | unsigned long usecs_to_sclk(unsigned long usecs) |
503 | { | 503 | { |
504 | return get_sclk() / (USEC_PER_SEC * (u64)usecs); | 504 | return (get_sclk() * (u64)usecs) / USEC_PER_SEC; |
505 | } | 505 | } |
506 | EXPORT_SYMBOL(usecs_to_sclk); | 506 | EXPORT_SYMBOL(usecs_to_sclk); |
507 | 507 | ||
@@ -589,7 +589,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
589 | #elif defined CONFIG_BFIN_WT | 589 | #elif defined CONFIG_BFIN_WT |
590 | "wt" | 590 | "wt" |
591 | #endif | 591 | #endif |
592 | , 0); | 592 | "", 0); |
593 | 593 | ||
594 | seq_printf(m, "%s\n", cache); | 594 | seq_printf(m, "%s\n", cache); |
595 | 595 | ||