When the kernel is configured without CONFIG_ISAPNP, files including
isapnp.h end up with duplicate symbols, preventing linking.
-Mike
--- linux-2.3.27/include/linux/isapnp.h.org Fri Nov 12 11:28:42 1999
+++ linux-2.3.27/include/linux/isapnp.h Fri Nov 12 12:34:02 1999
@@ -23,6 +23,7 @@
#define LINUX_ISAPNP_H
#include <linux/config.h>
+#include <linux/errno.h>
/*
* Configuration registers (TODO: change by specification)
@@ -163,19 +164,19 @@
extern inline void isapnp_write_byte(unsigned char idx, unsigned char val) { ; }
extern inline void isapnp_write_word(unsigned char idx, unsigned short val) { ; }
extern inline void isapnp_write_dword(unsigned char idx, unsigned int val) { ; }
-extern void isapnp_wake(unsigned char csn) { ; }
-extern void isapnp_device(unsigned char device) { ; }
-extern void isapnp_activate(unsigned char device) { ; }
-extern void isapnp_deactivate(unsigned char device) { ; }
+extern inline void isapnp_wake(unsigned char csn) { ; }
+extern inline void isapnp_device(unsigned char device) { ; }
+extern inline void isapnp_activate(unsigned char device) { ; }
+extern inline void isapnp_deactivate(unsigned char device) { ; }
/* manager */
-extern struct pci_bus *isapnp_find_card(unsigned short vendor,
+extern inline struct pci_bus *isapnp_find_card(unsigned short vendor,
unsigned short device,
struct pci_bus *from) { return NULL; }
-extern struct pci_dev *isapnp_find_dev(struct pci_bus *card,
+extern inline struct pci_dev *isapnp_find_dev(struct pci_bus *card,
unsigned short vendor,
unsigned short function,
struct pci_dev *from) { return NULL; }
-extern void isapnp_resource_change(struct resource *resource,
+extern inline void isapnp_resource_change(struct resource *resource,
unsigned long start,
unsigned long size) { ; }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/