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
This commit is contained in:
Linus Torvalds
2019-01-05 11:35:55 -08:00
2 changed files with 1 additions and 18 deletions

View File

@@ -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

View File

@@ -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 */