Commit MetaInfo

Revision04c1b877926b686b1d02a7dccdb5d533b461a733 (tree)
Time2018-12-29 00:19:33
AuthorGuenter Roeck <linux@roec...>
CommiterYoshinori Sato

Log Message

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>

Change Summary

Incremental Difference

--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@ -33,6 +33,7 @@ generic-y += mmu.h
3333 generic-y += mmu_context.h
3434 generic-y += module.h
3535 generic-y += parport.h
36+generic-y += pci.h
3637 generic-y += percpu.h
3738 generic-y += pgalloc.h
3839 generic-y += preempt.h
--- a/arch/h8300/include/asm/pci.h
+++ /dev/null
@@ -1,18 +0,0 @@
1-/* SPDX-License-Identifier: GPL-2.0 */
2-#ifndef _ASM_H8300_PCI_H
3-#define _ASM_H8300_PCI_H
4-
5-/*
6- * asm-h8300/pci.h - H8/300 specific PCI declarations.
7- *
8- * Yoshinori Sato <ysato@users.sourceforge.jp>
9- */
10-
11-#define pcibios_assign_all_busses() 0
12-
13-static inline void pcibios_penalize_isa_irq(int irq, int active)
14-{
15- /* We don't do dynamic PCI IRQ allocation */
16-}
17-
18-#endif /* _ASM_H8300_PCI_H */
Show on old repository browser