Lets get rid of empty PCI init stub, related ACPI header and go with full-blown PCI host bridge driver. Signed-off-by: Tomasz Nowicki <tn@xxxxxxxxxxxx> CC: Arnd Bergmann <arnd@xxxxxxxx> CC: Catalin Marinas <catalin.marinas@xxxxxxx> CC: Liviu Dudau <Liviu.Dudau@xxxxxxx> CC: Lorenzo Pieralisi <Lorenzo.Pieralisi@xxxxxxx> CC: Will Deacon <will.deacon@xxxxxxx> --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/pci.c | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index d65d315..573bebc 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -2,6 +2,7 @@ config ARM64 def_bool y select ACPI_CCA_REQUIRED if ACPI select ACPI_GENERIC_GSI if ACPI + select ACPI_PCI_HOST_GENERIC if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_ELF_RANDOMIZE diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index 023b983..a0929a6 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -10,7 +10,6 @@ * */ -#include <linux/acpi.h> #include <linux/init.h> #include <linux/io.h> #include <linux/kernel.h> @@ -60,12 +59,3 @@ int pcibios_add_device(struct pci_dev *dev) return 0; } - -#ifdef CONFIG_ACPI -/* Root bridge scanning */ -struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) -{ - /* TODO: Should be revisited when implementing PCI on ACPI */ - return NULL; -} -#endif -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html