CE4100 PCI specific code has no 'pci' suffix in the filename, intel_mid_pci.c is the only one that duplicates the folder name in its filename, drop that redundancy. While at it, group the respective modules in the Makefile. Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> --- MAINTAINERS | 2 +- arch/x86/pci/Makefile | 6 +++--- arch/x86/pci/{intel_mid_pci.c => intel_mid.c} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename arch/x86/pci/{intel_mid_pci.c => intel_mid.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 96b827049501..1f6514d55b17 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12120,7 +12120,7 @@ M: Andy Shevchenko <andy@xxxxxxxxxx> L: linux-kernel@xxxxxxxxxxxxxxx S: Supported F: arch/x86/include/asm/intel-mid.h -F: arch/x86/pci/intel_mid_pci.c +F: arch/x86/pci/intel_mid.c F: arch/x86/platform/intel-mid/ F: drivers/dma/hsu/ F: drivers/extcon/extcon-intel-mrfld.c diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index 4933fb337983..c1efd5b0d198 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile @@ -8,13 +8,13 @@ obj-$(CONFIG_PCI_OLPC) += olpc.o obj-$(CONFIG_PCI_XEN) += xen.o obj-y += fixup.o -obj-$(CONFIG_X86_INTEL_CE) += ce4100.o obj-$(CONFIG_ACPI) += acpi.o obj-y += legacy.o irq.o -obj-$(CONFIG_X86_NUMACHIP) += numachip.o +obj-$(CONFIG_X86_INTEL_CE) += ce4100.o +obj-$(CONFIG_X86_INTEL_MID) += intel_mid.o -obj-$(CONFIG_X86_INTEL_MID) += intel_mid_pci.o +obj-$(CONFIG_X86_NUMACHIP) += numachip.o obj-y += common.o early.o obj-y += bus_numa.o diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid.c similarity index 100% rename from arch/x86/pci/intel_mid_pci.c rename to arch/x86/pci/intel_mid.c -- 2.47.2