History

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

Linus Torvalds committed 5 years ago

Commit fb9ca0b2 parents be31d94 24e8ab63 files · +8 −19Browse files

Showing the changes to include/linux (1 of 3 files). Show all

Unified · Split

include/linux/acpi.h+7−0
@@ -885,6 +885,13 @@ static inline int acpi_device_modalias(struct device *dev, · 884 unmodified lines
885885 return -ENODEV;
886886 }
887887
888+static inline struct platform_device *
889+acpi_create_platform_device(struct acpi_device *adev,
890+ struct property_entry *properties)
891+{
892+ return NULL;
893+}
894+
888895 static inline bool acpi_dma_supported(struct acpi_device *adev)
889896 {
890897 return false;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t