summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFrederik Deweerdt <deweerdt@free.fr>2006-10-06 20:58:24 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 21:11:08 +0200
commite317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (patch)
tree327b25cecd21d97097b1249fe73a5c9ff2a6bcc6 /arch
parent[PATCH] fix mesh compile errors after irq changes (diff)
downloadlinux-e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67.tar.xz
linux-e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67.zip
[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.c3
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 @@
#include <linux/profile.h>
#include <linux/sysdev.h>
#include <linux/timer.h>
+#include <linux/irq.h>
#include <asm/leds.h>
#include <asm/thread_info.h>
@@ -327,7 +328,7 @@ EXPORT_SYMBOL(restore_time_delta);
void timer_tick(void)
{
struct pt_regs *regs = get_irq_regs();
- profile_tick(CPU_PROFILING, regs);
+ profile_tick(CPU_PROFILING);
do_leds();
do_set_rtc();
do_timer(1);