Commit f7b4ca43 authored by Mika Kukkonen's avatar Mika Kukkonen Committed by Linus Torvalds

[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: default avatarMika Kukkonen <mikukkon@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8c9145c1
...@@ -7,7 +7,12 @@ ...@@ -7,7 +7,12 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/pnp.h> #include <linux/pnp.h>
#include <linux/pnpbios.h> #include <linux/pnpbios.h>
#ifdef CONFIG_PCI
#include <linux/pci.h> #include <linux/pci.h>
#else
inline void pcibios_penalize_isa_irq(int irq) {}
#endif /* CONFIG_PCI */
#include "pnpbios.h" #include "pnpbios.h"
......
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