Pull motherboard into test branch

Conflicts:

	drivers/acpi/motherboard.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2007-02-03 01:38:16 -05:00
6 changed files with 80 additions and 209 deletions

View File

@@ -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