Commit 8528eb38 authored by Kai Germaschewski's avatar Kai Germaschewski Committed by Linus Torvalds

[PATCH] pnpbios compilation warning fix

Declare pnpbios_init as returning int, as __initcalls are supposed to.
parent eabbc63c
...@@ -1189,7 +1189,7 @@ __setup("pnpbios=", pnpbios_setup); ...@@ -1189,7 +1189,7 @@ __setup("pnpbios=", pnpbios_setup);
subsys_initcall(pnpbios_init); subsys_initcall(pnpbios_init);
void __init pnpbios_init(void) int __init pnpbios_init(void)
{ {
union pnp_bios_expansion_header *check; union pnp_bios_expansion_header *check;
u8 sum; u8 sum;
...@@ -1200,7 +1200,7 @@ void __init pnpbios_init(void) ...@@ -1200,7 +1200,7 @@ void __init pnpbios_init(void)
if(pnpbios_disabled) { if(pnpbios_disabled) {
printk(KERN_INFO "PnPBIOS: Disabled.\n"); printk(KERN_INFO "PnPBIOS: Disabled.\n");
return; return 0;
} }
if ( is_sony_vaio_laptop ) if ( is_sony_vaio_laptop )
...@@ -1253,6 +1253,7 @@ void __init pnpbios_init(void) ...@@ -1253,6 +1253,7 @@ void __init pnpbios_init(void)
if(kernel_thread(pnp_dock_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL)>0) if(kernel_thread(pnp_dock_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL)>0)
unloading = 0; unloading = 0;
#endif #endif
return 0;
} }
#ifdef MODULE #ifdef MODULE
......
...@@ -142,7 +142,7 @@ static __inline struct pnpbios_driver *pnpbios_dev_driver(const struct pci_dev * ...@@ -142,7 +142,7 @@ static __inline struct pnpbios_driver *pnpbios_dev_driver(const struct pci_dev *
extern int pnpbios_dont_use_current_config; extern int pnpbios_dont_use_current_config;
extern void *pnpbios_kmalloc(size_t size, int f); 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 void pnpbios_proc_init (void);
extern int pnp_bios_dev_node_info (struct pnp_dev_node_info *data); extern int pnp_bios_dev_node_info (struct pnp_dev_node_info *data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment