Skip to contentSkip to conversation

acpi: fix compile error with ACPI && !ACPI_POWER

PATCH Applied Andreas Herrmann 2 participants 2 messages Jun 19, 2007 – Jun 20, 2007 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 3/12 acpi: fix compile error with ACPI && !ACPI_POWER

Fix compile error with ACPI && !ACPI_POWER as bus.c depends on power.c

---
 drivers/acpi/Kconfig  |    4 ----
 drivers/acpi/Makefile |    2 +-
 2 files changed, 1 insertions(+), 5 deletions(-)
drivers/acpi/Kconfig +0 -4
index 139f41f..9d6baab 100644
@@ -288,10 +288,6 @@ config ACPI_EC
 	  the battery and thermal drivers.  If you are compiling for a 
 	  mobile system, say Y.
 
-config ACPI_POWER
-	bool
-	default y
-
 config ACPI_SYSTEM
 	bool
 	default y
drivers/acpi/Makefile +1 -1
index d4336f1..9485cc3 100644
@@ -48,7 +48,7 @@ obj-$(CONFIG_ACPI_DOCK)		+= dock.o
 obj-$(CONFIG_ACPI_BAY)		+= bay.o
 obj-$(CONFIG_ACPI_VIDEO)	+= video.o
 obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
-obj-$(CONFIG_ACPI_POWER)	+= power.o
+obj-y				+= power.o
 obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
 obj-$(CONFIG_ACPI_CONTAINER)	+= container.o
 obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o
Signature · 1 line
1.5.0.7
reviewer
#1 lore raw
Quoted 2 lines · Andreas Herrmann

Fix compile error with ACPI && !ACPI_POWER as bus.c depends on power.c

How were you able to set CONFIG_ACPI_POWER=n to cause this compile error?

When I do that, "make oldconfig" forces it to =y.

-Len

Quoted 34 lines
---
 drivers/acpi/Kconfig  |    4 ----
 drivers/acpi/Makefile |    2 +-
 2 files changed, 1 insertions(+), 5 deletions(-)
drivers/acpi/Kconfig +0 -4
index 139f41f..9d6baab 100644
@@ -288,10 +288,6 @@ config ACPI_EC
 	  the battery and thermal drivers.  If you are compiling for a 
 	  mobile system, say Y.
 
-config ACPI_POWER
-	bool
-	default y
-
 config ACPI_SYSTEM
 	bool
 	default y
drivers/acpi/Makefile +1 -1
index d4336f1..9485cc3 100644
@@ -48,7 +48,7 @@ obj-$(CONFIG_ACPI_DOCK)		+= dock.o
 obj-$(CONFIG_ACPI_BAY)		+= bay.o
 obj-$(CONFIG_ACPI_VIDEO)	+= video.o
 obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
-obj-$(CONFIG_ACPI_POWER)	+= power.o
+obj-y				+= power.o
 obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
 obj-$(CONFIG_ACPI_CONTAINER)	+= container.o
 obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o