فهرست منبع

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: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Bjorn Helgaas 16 سال پیش
والد
کامیت
fefe5ab3d6
3فایلهای تغییر یافته به همراه1 افزوده شده و 7 حذف شده
  1. 0 4
      drivers/acpi/Kconfig
  2. 1 1
      drivers/acpi/Makefile
  3. 0 2
      include/acpi/acpi_drivers.h

+ 0 - 4
drivers/acpi/Kconfig

@@ -341,10 +341,6 @@ config ACPI_PCI_SLOT
 	  help you correlate PCI bus addresses with the physical geography
 	  help you correlate PCI bus addresses with the physical geography
 	  of your slots. If you are unsure, say N.
 	  of your slots. If you are unsure, say N.
 
 
-config ACPI_POWER
-	bool
-	default y
-
 config ACPI_SYSTEM
 config ACPI_SYSTEM
 	bool
 	bool
 	default y
 	default y

+ 1 - 1
drivers/acpi/Makefile

@@ -51,7 +51,7 @@ obj-$(CONFIG_ACPI_PCI_SLOT)	+= pci_slot.o
 obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
 obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
 obj-$(CONFIG_ACPI_CONTAINER)	+= container.o
 obj-$(CONFIG_ACPI_CONTAINER)	+= container.o
 obj-$(CONFIG_ACPI_THERMAL)	+= thermal.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_SYSTEM)	+= system.o event.o
 obj-$(CONFIG_ACPI_DEBUG)	+= debug.o
 obj-$(CONFIG_ACPI_DEBUG)	+= debug.o
 obj-$(CONFIG_ACPI_NUMA)		+= numa.o
 obj-$(CONFIG_ACPI_NUMA)		+= numa.o

+ 0 - 2
include/acpi/acpi_drivers.h

@@ -86,7 +86,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
                                   Power Resource
                                   Power Resource
    -------------------------------------------------------------------------- */
    -------------------------------------------------------------------------- */
 
 
-#ifdef CONFIG_ACPI_POWER
 int acpi_device_sleep_wake(struct acpi_device *dev,
 int acpi_device_sleep_wake(struct acpi_device *dev,
                            int enable, int sleep_state, int dev_state);
                            int enable, int sleep_state, int dev_state);
 int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_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_get_inferred_state(struct acpi_device *device);
 int acpi_power_transition(struct acpi_device *device, int state);
 int acpi_power_transition(struct acpi_device *device, int state);
 extern int acpi_power_nocheck;
 extern int acpi_power_nocheck;
-#endif
 
 
 /* --------------------------------------------------------------------------
 /* --------------------------------------------------------------------------
                                   Embedded Controller
                                   Embedded Controller