diff options
| author | davem <davem> | 2002-01-24 15:36:24 +0000 |
|---|---|---|
| committer | davem <davem> | 2002-01-24 15:36:24 +0000 |
| commit | 2ec9b4d72bd417059aae24bc867b2a6b4eb4c83a (patch) | |
| tree | b4c653faec113c668853b5a71f5d7d786a2f6f3e | |
| parent | dfc969f06995d2388f9e4d737a48ec69483dcb71 (diff) | |
| download | netdev-vger-cvs-2ec9b4d72bd417059aae24bc867b2a6b4eb4c83a.tar.gz | |
Fix sbus_init declaration.
Include linux/init.h in sysv/inode.c
| -rw-r--r-- | drivers/sbus/sbus.c | 13 | ||||
| -rw-r--r-- | fs/sysv/inode.c | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c index 54b480a3b..fc19af616 100644 --- a/drivers/sbus/sbus.c +++ b/drivers/sbus/sbus.c @@ -1,4 +1,4 @@ -/* $Id: sbus.c,v 1.99 2002-01-24 14:07:52 davem Exp $ +/* $Id: sbus.c,v 1.100 2002-01-24 15:36:24 davem Exp $ * sbus.c: SBus support routines. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -284,7 +284,7 @@ extern void register_proc_sparc_ioport(void); extern void firetruck_init(void); extern void rs_init(void); -void __init sbus_init(void) +static int __init sbus_init(void) { int nd, this_sbus, sbus_devs, topnd, iommund; unsigned int sbus_clock; @@ -297,7 +297,8 @@ void __init sbus_init(void) #endif #ifdef CONFIG_SUN4 - return sun4_dvma_init(); + sun4_dvma_init(); + return 0; #endif topnd = prom_getchild(prom_root_node); @@ -316,7 +317,7 @@ void __init sbus_init(void) firetruck_init(); #endif } - return; + return 0; #else prom_printf("YEEE, UltraSparc sbus not found\n"); prom_halt(); @@ -337,7 +338,7 @@ void __init sbus_init(void) prom_printf("Neither SBUS nor PCI found.\n"); prom_halt(); } - return; + return 0; #else /* No reason to run further - the data access trap will occur. */ panic("sbus not found"); @@ -508,6 +509,8 @@ void __init sbus_init(void) clock_probe(); } #endif + + return 0; } subsys_initcall(sbus_init); diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c index c554f1d46..58dfd6ac5 100644 --- a/fs/sysv/inode.c +++ b/fs/sysv/inode.c @@ -27,6 +27,7 @@ #include <linux/smp_lock.h> #include <linux/highuid.h> #include <linux/slab.h> +#include <linux/init.h> #include <asm/byteorder.h> /* This is only called on sync() and umount(), when s_dirt=1. */ |