Commit 24e8ab68 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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

* 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
parents aa7a1bb0 ee61cfd9 240bdc60

drivers/acpi/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -395,9 +395,6 @@ config ACPI_CONTAINER 


	  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

	bool "Memory Hotplug"

	depends on MEMORY_HOTPLUG
@@ -411,9 +408,6 @@ config ACPI_HOTPLUG_MEMORY 
	  removing memory devices at runtime, you need not enable

	  this driver.



	  To compile this driver as a module, choose M here:

	  the module will be called acpi_memhotplug.



config ACPI_HOTPLUG_IOAPIC

	bool

	depends on PCI

include/linux/acpi.h

+7 −0
Original line number Diff line number Diff line
@@ -885,6 +885,13 @@ static inline int acpi_device_modalias(struct device *dev, 
	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)

{

	return false;