From: Rafael J. Wysocki Date: Thu, 7 Nov 2013 00:40:50 +0000 (+0100) Subject: ACPI: Remove acpi_pci_slot_init() headers from internal.h X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=71bba8fafac8975dbb684df4098d2dd6baac1fda;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ACPI: Remove acpi_pci_slot_init() headers from internal.h Since acpi_pci_slot_init() is now called from acpi_pci_init() and pci-acpi.h contains its header, remove that header (and the empty definition of that function for CONFIG_ACPI_PCI_SLOT unset) from internal.h as it doesn't have to be there any more. That also avoids a build warning about duplicate function definitions for CONFIG_ACPI_PCI_SLOT unset. Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 20f423337e1f..ebc3ad0a188d 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -26,11 +26,6 @@ acpi_status acpi_os_initialize1(void); int init_acpi_device_notify(void); int acpi_scan_init(void); -#ifdef CONFIG_ACPI_PCI_SLOT -void acpi_pci_slot_init(void); -#else -static inline void acpi_pci_slot_init(void) { } -#endif void acpi_pci_root_init(void); void acpi_pci_link_init(void); void acpi_pci_root_hp_init(void);