diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-09 02:42:56 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-09 02:42:56 +0300 |
| commit | fb9ca0be63b49eece304f50023e736a678cc4159 (patch) | |
| tree | 8fef8bfe264a01bb3c9565bab8828ec6d52714d7 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | be31d940b3b62c57a5d9506090e66e177b7eba90 (diff) | |
| parent | 24e8ab6886d80fe60b1d4e64b6d9f15ea9ad597a (diff) | |
| download | linux-fb9ca0be63b49eece304f50023e736a678cc4159.tar.xz | |
Merge tag 'acpi-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These address two build issues and drop confusing text from a couple
of Kconfig entries.
Specifics:
- Drop two local variables that are never read and the code updating
their values from the x86 suspend-to-idle code (Rafael Wysocki)
- Add empty stub of an ACPI helper function to avoid build issues
when CONFIG_ACPI is not set (Shawn Guo)
- Remove confusing text regarding modules from Kconfig entries that
correspond to non-modular code (Peter Robinson)"
* tag 'acpi-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: Update Kconfig help text for items that are no longer modular
ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI
ACPI: PM: s2idle: Drop unused local variables and related code
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
0 files changed, 0 insertions, 0 deletions