diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 01:40:50 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 01:40:50 +0100 |
| commit | 71bba8fafac8975dbb684df4098d2dd6baac1fda (patch) | |
| tree | d4adf914f3842c1387be19d3b2dc2cbf98c131c3 | |
| parent | 16ff816d3b5d2b81fcff5ca44eb9a98ac3b604b4 (diff) | |
| download | blackbird-op-linux-71bba8fafac8975dbb684df4098d2dd6baac1fda.tar.gz blackbird-op-linux-71bba8fafac8975dbb684df4098d2dd6baac1fda.zip | |
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 <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/internal.h | 5 |
1 files changed, 0 insertions, 5 deletions
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); |
