Hi Stafford, On Sun, Jul 17, 2022 at 5:35 AM Stafford Horne <shorne@xxxxxxxxx> wrote: > The generic pci.h header now only provides a definition of > pci_get_legacy_ide_irq which is used by architectures that support PNP. > Of the architectures that use asm-generic/pci.h this is only x86. > > This patch removes the old pci.h in order to make room for a new > pci.h to be used by arm64, riscv, openrisc, etc. > > The existing code in pci.h is moved out to x86. On other architectures > we clean up any outstanding references. > > Suggested-by: Arnd Bergmann <arnd@xxxxxxxx> > Link: https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@xxxxxxxxxxxxxx/ > Signed-off-by: Stafford Horne <shorne@xxxxxxxxx> Thanks for your patch! > --- a/arch/m68k/include/asm/pci.h > +++ b/arch/m68k/include/asm/pci.h > @@ -2,11 +2,14 @@ > #ifndef _ASM_M68K_PCI_H > #define _ASM_M68K_PCI_H > > -#include <asm-generic/pci.h> > - > #define pcibios_assign_all_busses() 1 > > #define PCIBIOS_MIN_IO 0x00000100 > #define PCIBIOS_MIN_MEM 0x02000000 > > +static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) > +{ > + return channel ? 15 : 14; > +} > + I thought you were not going to add this? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds