]> git.baikalelectronics.ru Git - kernel.git/commit
h8300: pci: Remove local declaration of pcibios_penalize_isa_irq
authorGuenter Roeck <linux@roeck-us.net>
Thu, 27 Dec 2018 16:46:38 +0000 (08:46 -0800)
committerYoshinori Sato <ysato@users.sourceforge.jp>
Fri, 28 Dec 2018 15:21:10 +0000 (00:21 +0900)
commit2c3f770a7756e03d04c233322410046727810de8
treedde565d7c163785921440111550db1f82a9c217e
parent3692308643e81fc57be35d0dc8c354d00953403e
h8300: pci: Remove local declaration of pcibios_penalize_isa_irq

h8300 builds fail with:

In file included from drivers/of/address.c:11:
include/linux/pci.h:1966:20: error: redefinition of 'pcibios_penalize_isa_irq'

This is because CONFIG_PCI is not enabled, and pcibios_penalize_isa_irq()
is now declared as inline static function in generic code if this is the
case. Since h8300 does not support PCI to start with, fix the problem by
removing the architecture specific pci.h.

Fixes: 0776386189bf3 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
Cc: Sinan Kaya <okaya@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
arch/h8300/include/asm/Kbuild
arch/h8300/include/asm/pci.h [deleted file]