summaryrefslogtreecommitdiffstats
path: root/drivers/sbus/dvma.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /drivers/sbus/dvma.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'drivers/sbus/dvma.c')
-rw-r--r--drivers/sbus/dvma.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/sbus/dvma.c b/drivers/sbus/dvma.c
index cf60be798..e5e5a655d 100644
--- a/drivers/sbus/dvma.c
+++ b/drivers/sbus/dvma.c
@@ -29,8 +29,7 @@ dump_dma_regs(struct sparc_dma_registers *dregs)
return;
}
-__initfunc(void
-init_one_dvma(struct Linux_SBus_DMA *dma, int num_dma))
+void __init init_one_dvma(struct Linux_SBus_DMA *dma, int num_dma)
{
printk("dma%d: ", num_dma);
@@ -75,8 +74,7 @@ init_one_dvma(struct Linux_SBus_DMA *dma, int num_dma))
}
/* Probe this SBus DMA module(s) */
-__initfunc(void
-dvma_init(struct linux_sbus *sbus))
+void __init dvma_init(struct linux_sbus *sbus)
{
struct linux_sbus_device *this_dev;
struct Linux_SBus_DMA *dma;
@@ -133,7 +131,7 @@ dvma_init(struct linux_sbus *sbus))
#include <asm/sun4paddr.h>
-__initfunc(void sun4_dvma_init(void))
+void __init sun4_dvma_init(void)
{
struct Linux_SBus_DMA *dma;
struct Linux_SBus_DMA *dchain;