Commit fefe5ab3 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: remove CONFIG_ACPI_POWER 



Remove CONFIG_ACPI_POWER.  It was always set the same as CONFIG_ACPI,
and it had no menu label, so there was no way to set it to anything
other than "y".

The interfaces under CONFIG_ACPI_POWER (acpi_device_sleep_wake(),
acpi_power_transition(), etc) are called unconditionally from the
ACPI core, so we already depend on it always being present.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 5b881479

drivers/acpi/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -341,10 +341,6 @@ config ACPI_PCI_SLOT 
	  help you correlate PCI bus addresses with the physical geography

	  of your slots. If you are unsure, say N.



config ACPI_POWER

	bool

	default y



config ACPI_SYSTEM

	bool

	default y

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o 
obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o

obj-$(CONFIG_ACPI_CONTAINER)	+= container.o

obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o

obj-$(CONFIG_ACPI_POWER)	+= power.o

obj-y				+= power.o

obj-$(CONFIG_ACPI_SYSTEM)	+= system.o event.o

obj-$(CONFIG_ACPI_DEBUG)	+= debug.o

obj-$(CONFIG_ACPI_NUMA)		+= numa.o

include/acpi/acpi_drivers.h

+0 −2
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, 
                                  Power Resource

   -------------------------------------------------------------------------- */



#ifdef CONFIG_ACPI_POWER

int acpi_device_sleep_wake(struct acpi_device *dev,

                           int enable, int sleep_state, int dev_state);

int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
@@ -94,7 +93,6 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev); 
int acpi_power_get_inferred_state(struct acpi_device *device);

int acpi_power_transition(struct acpi_device *device, int state);

extern int acpi_power_nocheck;

#endif



/* --------------------------------------------------------------------------

                                  Embedded Controller

CRA Git | Maintained and supported by SUSTech CRA and CCSE