Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-03-07 00:40:19 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-03-07 00:40:19 -0800
commit8528eb38020082d6c9a32b7ea39a275c85279bc3 (patch)
tree37d7af429adbdc955ecae074812b5b8e3c06e6b0
parenteabbc63cda8ca79e5d33611b049a67a3afe085b6 (diff)
[PATCH] pnpbios compilation warning fix
Declare pnpbios_init as returning int, as __initcalls are supposed to.
-rw-r--r--drivers/pnp/pnpbios_core.c5
-rw-r--r--include/linux/pnpbios.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pnp/pnpbios_core.c b/drivers/pnp/pnpbios_core.c
index 55a844e0566b..6f2eda9cb3f6 100644
--- a/drivers/pnp/pnpbios_core.c
+++ b/drivers/pnp/pnpbios_core.c
@@ -1189,7 +1189,7 @@ __setup("pnpbios=", pnpbios_setup);
subsys_initcall(pnpbios_init);
-void __init pnpbios_init(void)
+int __init pnpbios_init(void)
{
union pnp_bios_expansion_header *check;
u8 sum;
@@ -1200,7 +1200,7 @@ void __init pnpbios_init(void)
if(pnpbios_disabled) {
printk(KERN_INFO "PnPBIOS: Disabled.\n");
- return;
+ return 0;
}
if ( is_sony_vaio_laptop )
@@ -1253,6 +1253,7 @@ void __init pnpbios_init(void)
if(kernel_thread(pnp_dock_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL)>0)
unloading = 0;
#endif
+ return 0;
}
#ifdef MODULE
diff --git a/include/linux/pnpbios.h b/include/linux/pnpbios.h
index ce68c4bb7ab4..b1b2b6f9e5e6 100644
--- a/include/linux/pnpbios.h
+++ b/include/linux/pnpbios.h
@@ -142,7 +142,7 @@ static __inline struct pnpbios_driver *pnpbios_dev_driver(const struct pci_dev *
extern int pnpbios_dont_use_current_config;
extern void *pnpbios_kmalloc(size_t size, int f);
-extern void pnpbios_init (void);
+extern int pnpbios_init (void);
extern void pnpbios_proc_init (void);
extern int pnp_bios_dev_node_info (struct pnp_dev_node_info *data);