diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2018-12-27 08:46:38 -0800 |
|---|---|---|
| committer | Yoshinori Sato <ysato@users.sourceforge.jp> | 2018-12-29 00:21:10 +0900 |
| commit | 21c7acc439b55d0569d7c2fc2eea5194b3910406 (patch) | |
| tree | dde565d7c163785921440111550db1f82a9c217e /arch | |
| parent | 00c569b567c7f1f0da6162868fd02a9f29411805 (diff) | |
| download | linux-stable-21c7acc439b55d0569d7c2fc2eea5194b3910406.tar.gz linux-stable-21c7acc439b55d0569d7c2fc2eea5194b3910406.tar.bz2 linux-stable-21c7acc439b55d0569d7c2fc2eea5194b3910406.zip | |
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: 5d32a66541c46 ("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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/h8300/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/h8300/include/asm/pci.h | 18 |
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild index a5d0b2991f47..cd400d353d18 100644 --- a/arch/h8300/include/asm/Kbuild +++ b/arch/h8300/include/asm/Kbuild @@ -33,6 +33,7 @@ generic-y += mmu.h generic-y += mmu_context.h generic-y += module.h generic-y += parport.h +generic-y += pci.h generic-y += percpu.h generic-y += pgalloc.h generic-y += preempt.h diff --git a/arch/h8300/include/asm/pci.h b/arch/h8300/include/asm/pci.h deleted file mode 100644 index d4d345a52092..000000000000 --- a/arch/h8300/include/asm/pci.h +++ /dev/null @@ -1,18 +0,0 @@ -/* 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 */ |