Commit 1255448c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ACPI sleep build fix

If you have !CONFIG_ACPI_SLEEP and CONFIG_PROC_FS, drivers/acpi/sleep/proc.o
is built, but drivers/acpi/sleep/main.o is not.

But proc.o needs symbols from main.o
parent a66bce5b
...@@ -75,6 +75,9 @@ config ACPI_SLEEP ...@@ -75,6 +75,9 @@ config ACPI_SLEEP
This option is not recommended for anyone except those doing driver This option is not recommended for anyone except those doing driver
power management development. power management development.
config ACPI_SLEEP_PROC_FS
depends on ACPI_SLEEP && PROC_FS
config ACPI_AC config ACPI_AC
tristate "AC Adapter" tristate "AC Adapter"
depends on X86 && ACPI && !ACPI_HT_ONLY depends on X86 && ACPI && !ACPI_HT_ONLY
......
obj-y := poweroff.o obj-y := poweroff.o
obj-$(CONFIG_ACPI_SLEEP) += main.o obj-$(CONFIG_ACPI_SLEEP) += main.o
obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_ACPI_SLEEP_PROC_FS) += proc.o
EXTRA_CFLAGS += $(ACPI_CFLAGS) EXTRA_CFLAGS += $(ACPI_CFLAGS)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment