Skip to content

Commit

Permalink
Merge back earlier ACPI PM material for v4.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafael J. Wysocki committed Jul 31, 2015
2 parents 71b6544 + 3431e49 commit 50ba224
Show file tree
Hide file tree
Showing 27 changed files with 2,884 additions and 869 deletions.
2 changes: 1 addition & 1 deletion drivers/acpi/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ acpi-y += nvs.o
# Power management related files
acpi-y += wakeup.o
acpi-$(CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT) += sleep.o
acpi-y += device_pm.o
acpi-y += device_sysfs.o device_pm.o
acpi-$(CONFIG_ACPI_SLEEP) += proc.o


Expand Down
Loading

0 comments on commit 50ba224

Please sign in to comment.