diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2003-09-21 04:33:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2003-09-21 04:33:41 -0700 |
| commit | 8090fa2412cd03d4fe550bede05aed971ce79b00 (patch) | |
| tree | ac6d8359d1a870687a85e6cc0f905e60dc93b0a0 /include | |
| parent | 767ac366108b95111b55d05c479a6031aad48806 (diff) | |
| parent | aad00662730e31461c6fffe493aef04a87d97d49 (diff) | |
Merge davem@nuts.ninka.net:/disk1/davem/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pnpbios.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/pnpbios.h b/include/linux/pnpbios.h index 5b0e599dd5e2..0720cd72d63a 100644 --- a/include/linux/pnpbios.h +++ b/include/linux/pnpbios.h @@ -26,7 +26,7 @@ #ifdef __KERNEL__ #include <linux/types.h> -#include <linux/pci.h> +#include <linux/pnp.h> /* * Return codes @@ -131,13 +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 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); |