leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'acpi-scan' and 'acpi-misc'

Browse Source 
* acpi-scan:
  ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI

* acpi-misc:
  ACPI: Update Kconfig help text for items that are no longer modular
This commit is contained in:
Rafael J. Wysocki 2021-01-08 18:15:44 +01:00
commit 24e8ab6886
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/Kconfig
View File

@ -395,9 +395,6 @@ config ACPI_CONTAINER
This helps support hotplug of nodes, CPUs, and memory. This helps support hotplug of nodes, CPUs, and memory.
To compile this driver as a module, choose M here:
the module will be called container.
config ACPI_HOTPLUG_MEMORY config ACPI_HOTPLUG_MEMORY
bool "Memory Hotplug" bool "Memory Hotplug"
depends on MEMORY_HOTPLUG depends on MEMORY_HOTPLUG
@ -411,9 +408,6 @@ config ACPI_HOTPLUG_MEMORY
removing memory devices at runtime, you need not enable removing memory devices at runtime, you need not enable
this driver. this driver.
To compile this driver as a module, choose M here:
the module will be called acpi_memhotplug.
config ACPI_HOTPLUG_IOAPIC config ACPI_HOTPLUG_IOAPIC
bool bool
depends on PCI depends on PCI

7
include/linux/acpi.h
View File

@ -885,6 +885,13 @@ static inline int acpi_device_modalias(struct device *dev,
return -ENODEV; return -ENODEV;
} }
static inline struct platform_device *
acpi_create_platform_device(struct acpi_device *adev,
struct property_entry *properties)
{
return NULL;
}
static inline bool acpi_dma_supported(struct acpi_device *adev) static inline bool acpi_dma_supported(struct acpi_device *adev)
{ {
return false; return false;