aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/mach-voyager/voyager_basic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-13 08:14:41 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-13 08:14:41 -0700
commit411fdc1a711665cb4bd13df2a75213153d463375 (patch)
tree3d228fb3563d2270ae2bcf5272298748017b9b9f /arch/i386/mach-voyager/voyager_basic.c
parent7f14daa19ea36b200d237ad3ac5826ae25360461 (diff)
parent81c06b10bcd4c7e8c88b4b425c55402b1d65fd0e (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6: [VOYAGER] fix up ptregs removal mess [VOYAGER] fix up attribute packed specifiers in voyager.h [VOYAGER] fix genirq mess
Diffstat (limited to 'arch/i386/mach-voyager/voyager_basic.c')
-rw-r--r--arch/i386/mach-voyager/voyager_basic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c
index c639d30d8bdc..8fe7e4593d5f 100644
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/i386/mach-voyager/voyager_basic.c
@@ -44,7 +44,7 @@ struct voyager_SUS *voyager_SUS = NULL;
#ifdef CONFIG_SMP
static void
-voyager_dump(int dummy1, struct pt_regs *dummy2, struct tty_struct *dummy3)
+voyager_dump(int dummy1, struct tty_struct *dummy3)
{
/* get here via a sysrq */
voyager_smp_dump();
@@ -166,7 +166,7 @@ voyager_memory_detect(int region, __u32 *start, __u32 *length)
* off the timer tick to the SMP code, since the VIC doesn't have an
* internal timer (The QIC does, but that's another story). */
void
-voyager_timer_interrupt(struct pt_regs *regs)
+voyager_timer_interrupt(void)
{
if((jiffies & 0x3ff) == 0) {
@@ -202,7 +202,7 @@ voyager_timer_interrupt(struct pt_regs *regs)
}
}
#ifdef CONFIG_SMP
- smp_vic_timer_interrupt(regs);
+ smp_vic_timer_interrupt();
#endif
}

Privacy Policy