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 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
mips
/
au1000
/
common
/
time.c
diff --git
a/arch/mips/au1000/common/time.c
b/arch/mips/au1000/common/time.c
index
f74d66a
..
7e988b0
100644
(file)
--- a/
arch/mips/au1000/common/time.c
+++ b/
arch/mips/au1000/common/time.c
@@
-33,7
+33,6
@@
*/
#include <linux/types.h>
*/
#include <linux/types.h>
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel_stat.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/kernel_stat.h>
#include <linux/sched.h>
@@
-50,10
+49,6
@@
#include <linux/mc146818rtc.h>
#include <linux/timex.h>
#include <linux/mc146818rtc.h>
#include <linux/timex.h>
-extern void do_softirq(void);
-extern volatile unsigned long wall_jiffies;
-unsigned long missed_heart_beats = 0;
-
static unsigned long r4k_offset; /* Amount to increment compare reg each time */
static unsigned long r4k_cur; /* What counter should be at next timer irq */
int no_au1xxx_32khz;
static unsigned long r4k_offset; /* Amount to increment compare reg each time */
static unsigned long r4k_cur; /* What counter should be at next timer irq */
int no_au1xxx_32khz;
@@
-388,10
+383,9
@@
static unsigned long do_fast_pm_gettimeoffset(void)
}
#endif
}
#endif
-void au1xxx_timer_setup(struct irqaction *irq)
+void
__init
au1xxx_timer_setup(struct irqaction *irq)
{
{
- unsigned int est_freq;
- extern unsigned long (*do_gettimeoffset)(void);
+ unsigned int est_freq;
printk("calculating r4koff... ");
r4k_offset = cal_r4koff();
printk("calculating r4koff... ");
r4k_offset = cal_r4koff();