[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>
This commit is contained in:
Frederik Deweerdt 2006-10-06 18:58:24 +00:00 committed by Linus Torvalds
parent b7696ee3c0
commit e317c8ccaa
2 changed files with 3 additions and 2 deletions

View file

@ -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);

View file

@ -38,7 +38,7 @@ static void resend_irqs(unsigned long arg)
clear_bit(irq, irqs_resend);
desc = irq_desc + irq;
local_irq_disable();
desc->handle_irq(irq, desc, NULL);
desc->handle_irq(irq, desc);
local_irq_enable();
}
}