The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 948fdcf94289b15f86ce8206abd92a3f7d12360a Gitweb: https://git.kernel.org/tip/948fdcf94289b15f86ce8206abd92a3f7d12360a Author: Christoph Hellwig <hch@xxxxxx> AuthorDate: Wed, 13 Nov 2019 08:18:35 +01:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Fri, 15 Nov 2019 10:36:59 +01:00 x86/pci: Remove pci_64.h This file only contains external declarations for two non-existing function pointers. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20191113071836.21041-3-hch@xxxxxx --- arch/x86/include/asm/pci.h | 4 ---- arch/x86/include/asm/pci_64.h | 14 -------------- 2 files changed, 18 deletions(-) delete mode 100644 arch/x86/include/asm/pci_64.h diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index e662f98..d9e28aa 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -120,10 +120,6 @@ void native_restore_msi_irqs(struct pci_dev *dev); #endif #endif /* __KERNEL__ */ -#ifdef CONFIG_X86_64 -#include <asm/pci_64.h> -#endif - /* generic pci stuff */ #include <asm-generic/pci.h> diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h deleted file mode 100644 index 4e1aef5..0000000 --- a/arch/x86/include/asm/pci_64.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_PCI_64_H -#define _ASM_X86_PCI_64_H - -#ifdef __KERNEL__ - -extern int (*pci_config_read)(int seg, int bus, int dev, int fn, - int reg, int len, u32 *value); -extern int (*pci_config_write)(int seg, int bus, int dev, int fn, - int reg, int len, u32 value); - -#endif /* __KERNEL__ */ - -#endif /* _ASM_X86_PCI_64_H */
|