projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
power_supply: remove capacity_level from list of sysfs attributes
[powerpc.git]
/
init
/
calibrate.c
diff --git
a/init/calibrate.c
b/init/calibrate.c
index
d206c75
..
ecb3822
100644
(file)
--- a/
init/calibrate.c
+++ b/
init/calibrate.c
@@
-4,13
+4,12
@@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
* Copyright (C) 1991, 1992 Linus Torvalds
*/
-#include <linux/
sched
.h>
+#include <linux/
jiffies
.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/init.h>
+#include <linux/timex.h>
-#include <asm/timex.h>
-
-static unsigned long preset_lpj;
+unsigned long preset_lpj;
static int __init lpj_setup(char *str)
{
preset_lpj = simple_strtoul(str,NULL,0);
static int __init lpj_setup(char *str)
{
preset_lpj = simple_strtoul(str,NULL,0);
@@
-29,7
+28,7
@@
__setup("lpj=", lpj_setup);
#define DELAY_CALIBRATION_TICKS ((HZ < 100) ? 1 : (HZ/100))
#define MAX_DIRECT_CALIBRATION_RETRIES 5
#define DELAY_CALIBRATION_TICKS ((HZ < 100) ? 1 : (HZ/100))
#define MAX_DIRECT_CALIBRATION_RETRIES 5
-static unsigned long __
dev
init calibrate_delay_direct(void)
+static unsigned long __
cpu
init calibrate_delay_direct(void)
{
unsigned long pre_start, start, post_start;
unsigned long pre_end, end, post_end;
{
unsigned long pre_start, start, post_start;
unsigned long pre_end, end, post_end;
@@
-102,7
+101,7
@@
static unsigned long __devinit calibrate_delay_direct(void)
return 0;
}
#else
return 0;
}
#else
-static unsigned long __
dev
init calibrate_delay_direct(void) {return 0;}
+static unsigned long __
cpu
init calibrate_delay_direct(void) {return 0;}
#endif
/*
#endif
/*
@@
-112,7
+111,7
@@
static unsigned long __devinit calibrate_delay_direct(void) {return 0;}
*/
#define LPS_PREC 8
*/
#define LPS_PREC 8
-void __
dev
init calibrate_delay(void)
+void __
cpu
init calibrate_delay(void)
{
unsigned long ticks, loopbit;
int lps_precision = LPS_PREC;
{
unsigned long ticks, loopbit;
int lps_precision = LPS_PREC;