提交 21c7acc4 编写于 作者: G Guenter Roeck 提交者: Yoshinori Sato

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: 5d32a665 ("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: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NYoshinori Sato <ysato@users.sourceforge.jp>
上级 00c569b5
...@@ -33,6 +33,7 @@ generic-y += mmu.h ...@@ -33,6 +33,7 @@ generic-y += mmu.h
generic-y += mmu_context.h generic-y += mmu_context.h
generic-y += module.h generic-y += module.h
generic-y += parport.h generic-y += parport.h
generic-y += pci.h
generic-y += percpu.h generic-y += percpu.h
generic-y += pgalloc.h generic-y += pgalloc.h
generic-y += preempt.h generic-y += preempt.h
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_H8300_PCI_H
#define _ASM_H8300_PCI_H
/*
* asm-h8300/pci.h - H8/300 specific PCI declarations.
*
* Yoshinori Sato <ysato@users.sourceforge.jp>
*/
#define pcibios_assign_all_busses() 0
static inline void pcibios_penalize_isa_irq(int irq, int active)
{
/* We don't do dynamic PCI IRQ allocation */
}
#endif /* _ASM_H8300_PCI_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册