From 8ba3fd9adb30ea4d18a1ce9471b95cf2ffe12cfa Mon Sep 17 00:00:00 2001 From: Adam Belay Date: Sun, 21 Sep 2003 17:55:37 +0000 Subject: [PNPBIOS] compilation fix for pnpbios without proc support Here's an updated patch that will correct the compile error when PROC FS is disabled. It also introduces better proc error recovery and moves the local proc functions to the local include file. Thanks to Daniele Bellucci for finding the problem and contributing to this patch. --- include/linux/pnpbios.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/linux') diff --git a/include/linux/pnpbios.h b/include/linux/pnpbios.h index 5b0e599dd5e2..4fefc51dbbcb 100644 --- a/include/linux/pnpbios.h +++ b/include/linux/pnpbios.h @@ -26,7 +26,7 @@ #ifdef __KERNEL__ #include -#include +#include /* * Return codes @@ -135,9 +135,6 @@ extern int pnpbios_dont_use_current_config; extern struct pnp_dev_node_info node_info; extern void *pnpbios_kmalloc(size_t size, int f); extern int pnpbios_init (void); -extern int pnpbios_interface_attach_device(struct pnp_bios_node * node); -extern int pnpbios_proc_init (void); -extern void pnpbios_proc_exit (void); extern int pnp_bios_dev_node_info (struct pnp_dev_node_info *data); extern int pnp_bios_get_dev_node (u8 *nodenum, char config, struct pnp_bios_node *data); -- cgit v1.2.3 From 9715e1df131ec4028e03d6f55fb22d935ee8b972 Mon Sep 17 00:00:00 2001 From: Adam Belay Date: Sun, 21 Sep 2003 19:24:48 +0000 Subject: [PNPBIOS] move some more functions to local include file This patch moves some unnecessary global functions to the local pnpbios include file. --- drivers/pnp/pnpbios/pnpbios.h | 2 ++ include/linux/pnpbios.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'include/linux') diff --git a/drivers/pnp/pnpbios/pnpbios.h b/drivers/pnp/pnpbios/pnpbios.h index d0a82650cf61..9287ffa46800 100644 --- a/drivers/pnp/pnpbios/pnpbios.h +++ b/drivers/pnp/pnpbios/pnpbios.h @@ -25,6 +25,8 @@ union pnp_bios_install_struct { #pragma pack() extern int pnp_bios_present(void); +extern int pnpbios_dont_use_current_config; +extern void *pnpbios_kmalloc(size_t size, int f); extern int pnpbios_parse_data_stream(struct pnp_dev *dev, struct pnp_bios_node * node); extern int pnpbios_read_resources_from_node(struct pnp_resource_table *res, struct pnp_bios_node * node); diff --git a/include/linux/pnpbios.h b/include/linux/pnpbios.h index 4fefc51dbbcb..0720cd72d63a 100644 --- a/include/linux/pnpbios.h +++ b/include/linux/pnpbios.h @@ -131,10 +131,7 @@ struct pnp_bios_node { #ifdef CONFIG_PNPBIOS /* non-exported */ -extern int pnpbios_dont_use_current_config; extern struct pnp_dev_node_info node_info; -extern void *pnpbios_kmalloc(size_t size, int f); -extern int pnpbios_init (void); extern int pnp_bios_dev_node_info (struct pnp_dev_node_info *data); extern int pnp_bios_get_dev_node (u8 *nodenum, char config, struct pnp_bios_node *data); -- cgit v1.2.3