summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Kukkonen <mikukkon@gmail.com>2005-02-21 15:30:32 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-02-21 15:30:32 -0800
commitf7b4ca436467077cb9ca69763e5fe2c643892b85 (patch)
tree63555915b4a2808158faa9eaa05bd1a6667905e5
parent8c9145c12971c3118697eb1732f6fd1fe8be6581 (diff)
[PATCH] Build failure with !CONFIG_PCI and with CONFIG_ISAPNP=y && CONFIG_PNPBIOS=y
Trying to build latest BK-kernel with !CONFIG_PCI and with CONFIG_ISAPNP=y and CONFIG_PNPBIOS=y I got the following build error: LD vmlinux drivers/built-in.o(.text+0x5486): In function 'pnpbios_parse_allocated_irqresource': : undefined reference to 'pcibios_penalize_isa_irq' Clearly pcibios_penalize_isa_irq() is meant to be called only with CONFIG_PCI=y. Signed-off-by: Mika Kukkonen <mikukkon@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/pnp/pnpbios/rsparser.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index 3c7f9772fce9..618ac15a9e90 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -7,7 +7,12 @@
#include <linux/ctype.h>
#include <linux/pnp.h>
#include <linux/pnpbios.h>
+
+#ifdef CONFIG_PCI
#include <linux/pci.h>
+#else
+inline void pcibios_penalize_isa_irq(int irq) {}
+#endif /* CONFIG_PCI */
#include "pnpbios.h"