git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
tsc.c
diff --git
a/arch/i386/kernel/tsc.c
b/arch/i386/kernel/tsc.c
index
fbc9582
..
1bbe45d
100644
(file)
--- a/
arch/i386/kernel/tsc.c
+++ b/
arch/i386/kernel/tsc.c
@@
-13,7
+13,6
@@
#include <asm/delay.h>
#include <asm/tsc.h>
#include <asm/delay.h>
#include <asm/tsc.h>
-#include <asm/delay.h>
#include <asm/io.h>
#include "mach_timer.h"
#include <asm/io.h>
#include "mach_timer.h"
@@
-217,7
+216,7
@@
static unsigned int cpufreq_delayed_issched = 0;
static unsigned int cpufreq_init = 0;
static struct work_struct cpufreq_delayed_get_work;
static unsigned int cpufreq_init = 0;
static struct work_struct cpufreq_delayed_get_work;
-static void handle_cpufreq_delayed_get(
void *v
)
+static void handle_cpufreq_delayed_get(
struct work_struct *work
)
{
unsigned int cpu;
{
unsigned int cpu;
@@
-306,7
+305,7
@@
static int __init cpufreq_tsc(void)
{
int ret;
{
int ret;
- INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get
, NULL
);
+ INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get);
ret = cpufreq_register_notifier(&time_cpufreq_notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
if (!ret)
ret = cpufreq_register_notifier(&time_cpufreq_notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
if (!ret)