Subject: [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

Signed-off-by: Andreas Herrmann <[email protected]>
---
drivers/acpi/Kconfig | 4 ----
drivers/acpi/Makefile | 2 +-
2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 139f41f..9d6baab 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -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
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index d4336f1..9485cc3 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -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
--
1.5.0.7





2007-06-20 03:34:14

by Len Brown

[permalink] [raw]
Subject: Re: [PATCH 3/12] acpi: fix compile error with ACPI && !ACPI_POWER

On Tuesday 19 June 2007 18:48, Andreas Herrmann wrote:
> 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

> Signed-off-by: Andreas Herrmann <[email protected]>
> ---
> drivers/acpi/Kconfig | 4 ----
> drivers/acpi/Makefile | 2 +-
> 2 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> index 139f41f..9d6baab 100644
> --- a/drivers/acpi/Kconfig
> +++ b/drivers/acpi/Kconfig
> @@ -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
> diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
> index d4336f1..9485cc3 100644
> --- a/drivers/acpi/Makefile
> +++ b/drivers/acpi/Makefile
> @@ -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