diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/mips/jazz | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/jazz')
| -rw-r--r-- | arch/mips/jazz/io.c | 2 | ||||
| -rw-r--r-- | arch/mips/jazz/setup.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/jazz/io.c b/arch/mips/jazz/io.c index 559dabeae..e86904454 100644 --- a/arch/mips/jazz/io.c +++ b/arch/mips/jazz/io.c @@ -8,9 +8,9 @@ * Copyright (C) 1997 by Ralf Baechle. */ #include <linux/string.h> +#include <linux/spinlock.h> #include <asm/addrspace.h> #include <asm/system.h> -#include <asm/spinlock.h> #include <asm/jazz.h> /* diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index 9c289ac66..4b405f405 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.22 1999/08/21 22:19:10 ralf Exp $ +/* $Id: setup.c,v 1.23 1999/10/07 07:31:14 raiko Exp $ * * Setup pointers to hardware-dependent routines. * @@ -52,14 +52,14 @@ extern struct fd_ops jazz_fd_ops; void (*board_time_init)(struct irqaction *irq); -__initfunc(static void jazz_time_init(struct irqaction *irq)) +static void __init jazz_time_init(struct irqaction *irq) { /* set the clock to 100 Hz */ r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9); i8259_setup_irq(JAZZ_TIMER_IRQ, irq); } -__initfunc(static void jazz_irq_setup(void)) +static void __init jazz_irq_setup(void) { set_except_vector(0, jazz_handle_int); r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, @@ -79,7 +79,7 @@ __initfunc(static void jazz_irq_setup(void)) i8259_setup_irq(2, &irq2); } -__initfunc(void jazz_setup(void)) +void __init jazz_setup(void) { add_wired_entry (0x02000017, 0x03c00017, 0xe0000000, PM_64K); add_wired_entry (0x02400017, 0x02440017, 0xe2000000, PM_16M); |