diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:44:57 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:44:57 +0200 |
commit | 5d2a3ca813f3d1dbebc39e8ad3f8ebd01b1ff627 (patch) | |
tree | 58a26ff5809af1054078f7348e3c34fed94c52ae /drivers/acpi/acpi_memhotplug.c | |
parent | Merge branch 'acpi-numa' (diff) | |
parent | ACPI: Make acpi_evaluate_dsm() prototype consistent (diff) | |
download | linux-5d2a3ca813f3d1dbebc39e8ad3f8ebd01b1ff627.tar.xz linux-5d2a3ca813f3d1dbebc39e8ad3f8ebd01b1ff627.zip |
Merge branch 'acpi-misc'
* acpi-misc:
ACPI: Make acpi_evaluate_dsm() prototype consistent
ACPI: wakeup: Remove dead ACPICA debug code
ACPI: video: Remove leftover ACPICA debug code
ACPI: tiny-power-button: Remove dead ACPICA debug code
ACPI: processor: Remove dead ACPICA debug code
ACPI: proc: Remove dead ACPICA debug code
ACPI: PCI: Remove unused ACPICA debug code
ACPI: event: Remove leftover ACPICA debug code
ACPI: dock: Remove dead ACPICA debug code
ACPI: debugfs: Remove dead ACPICA debug code
ACPI: custom_method: Remove dead ACPICA debug code
ACPI: container: Remove leftover ACPICA debug functionality
ACPI: platform: Remove ACPI_MODULE_NAME()
ACPI: memhotplug: Remove leftover ACPICA debug functionality
ACPI: LPSS: Remove ACPI_MODULE_NAME()
ACPI: cmos_rtc: Remove leftover ACPI_MODULE_NAME()
ACPI: Remove three unused inline functions
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
-rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index e294f44a7850..9cd987d5fee5 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -22,13 +22,6 @@ #define ACPI_MEMORY_DEVICE_HID "PNP0C80" #define ACPI_MEMORY_DEVICE_NAME "Hotplug Mem Device" -#define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT - -#undef PREFIX -#define PREFIX "ACPI:memory_hp:" - -ACPI_MODULE_NAME("acpi_memhotplug"); - static const struct acpi_device_id memory_device_ids[] = { {ACPI_MEMORY_DEVICE_HID, 0}, {"", 0}, |