Pull motherboard into test branch
Conflicts: drivers/acpi/motherboard.c Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
@@ -466,7 +466,8 @@ CONFIG_FW_LOADER=y
|
||||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
CONFIG_PNP=y
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
#
|
||||
# Block devices
|
||||
|
Reference in New Issue
Block a user