diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-02 10:37:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-02 10:37:50 -0700 |
| commit | 86166f9846590fa46f8e24e9346d002e938a8b81 (patch) | |
| tree | ef19ee1c7164e18eb6820d3c808da560efb5e181 /arch/arm/mach-sa1100 | |
| parent | 44f8e1a20cf3afe10a3744bd9317808a39a242bb (diff) | |
| parent | db5795547694cf68388aaf8f59723e850f7466f6 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/cpu-sa1110.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c index 8d2a89a2ea0..04c94ab6c18 100644 --- a/arch/arm/mach-sa1100/cpu-sa1110.c +++ b/arch/arm/mach-sa1100/cpu-sa1110.c @@ -271,8 +271,7 @@ static int sa1110_target(struct cpufreq_policy *policy, */ sdram_set_refresh(2); if (!irqs_disabled()) { - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(20 * HZ / 1000); + msleep(20); } else { mdelay(20); } |