Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 670b321f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b23b0ea3 21c7acc4

arch/h8300/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/h8300/include/asm/pci.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* 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 */