diff options
author | Frederik Deweerdt <deweerdt@free.fr> | 2006-10-06 14:58:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 15:11:08 -0400 |
commit | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (patch) | |
tree | 327b25cecd21d97097b1249fe73a5c9ff2a6bcc6 /arch | |
parent | b7696ee3c050a76a6cebccdbadfc93896b336e44 (diff) |
[PATCH] ixp4xxdefconfig arm fixes
With the following patch, the ixp4xxdefconfig builds correctly. I'll
test some more configs if I get some time.
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/kernel/time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index b094e3e81981..c03cab5c4c79 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/profile.h> | 27 | #include <linux/profile.h> |
28 | #include <linux/sysdev.h> | 28 | #include <linux/sysdev.h> |
29 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
30 | #include <linux/irq.h> | ||
30 | 31 | ||
31 | #include <asm/leds.h> | 32 | #include <asm/leds.h> |
32 | #include <asm/thread_info.h> | 33 | #include <asm/thread_info.h> |
@@ -327,7 +328,7 @@ EXPORT_SYMBOL(restore_time_delta); | |||
327 | void timer_tick(void) | 328 | void timer_tick(void) |
328 | { | 329 | { |
329 | struct pt_regs *regs = get_irq_regs(); | 330 | struct pt_regs *regs = get_irq_regs(); |
330 | profile_tick(CPU_PROFILING, regs); | 331 | profile_tick(CPU_PROFILING); |
331 | do_leds(); | 332 | do_leds(); |
332 | do_set_rtc(); | 333 | do_set_rtc(); |
333 | do_timer(1); | 334 | do_timer(1); |