diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 11:35:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 11:35:55 -0800 |
| commit | 670b321f4150bfc8a2261f4db3fcdab21738506b (patch) | |
| tree | a1a6d5f6c19118f784ba707ef52e1815acbb4f8a /arch/h8300 | |
| parent | b23b0ea3708c3dec599966fc856836aca48835b9 (diff) | |
| parent | 21c7acc439b55d0569d7c2fc2eea5194b3910406 (diff) | |
| download | linux-670b321f4150bfc8a2261f4db3fcdab21738506b.tar.gz linux-670b321f4150bfc8a2261f4db3fcdab21738506b.tar.bz2 linux-670b321f4150bfc8a2261f4db3fcdab21738506b.zip | |
Merge tag 'for-4.21' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux
Pull h8300 fix from Yoshinori Sato:
"Build problem fix"
* tag 'for-4.21' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux:
h8300: pci: Remove local declaration of pcibios_penalize_isa_irq
Diffstat (limited to 'arch/h8300')
| -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 */ |