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 /drivers/tc/tc.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/tc/tc.c')
| -rw-r--r-- | drivers/tc/tc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c index c5e3d4c6b..30cabd0ed 100644 --- a/drivers/tc/tc.c +++ b/drivers/tc/tc.c @@ -12,7 +12,7 @@ */ #include <linux/string.h> -#include <asm/init.h> +#include <linux/init.h> #include <asm/addrspace.h> #include <asm/errno.h> #include <asm/dec/machtype.h> @@ -92,12 +92,12 @@ unsigned long get_tc_speed(void) /* * Probing for TURBOchannel modules */ -__initfunc(static void my_dbe_handler(struct pt_regs *regs)) +static void __init my_dbe_handler(struct pt_regs *regs) { regs->cp0_epc += 4; } -__initfunc(static void tc_probe(unsigned long startaddr, unsigned long size, int max_slot)) +static void __init tc_probe(unsigned long startaddr, unsigned long size, int max_slot) { int i, slot; long offset; @@ -164,7 +164,7 @@ __initfunc(static void tc_probe(unsigned long startaddr, unsigned long size, int /* * the main entry */ -__initfunc(void tc_init(void)) +void __init tc_init(void) { int tc_clock; int i; |