diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-03 01:38:16 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-03 01:38:16 -0500 |
| commit | eee3c859c486d4f110f154807430eaf825ff4a3d (patch) | |
| tree | 8b378d16103b3d77a673e26fab0a6812459bab77 /arch/i386 | |
| parent | 547352660506ab99d6b0bad58dea495bf3718cee (diff) | |
| parent | fb5c3e1b6d304bcf5f8d697471e36f2fa8d53f1c (diff) | |
Pull motherboard into test branch
Conflicts:
drivers/acpi/motherboard.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 5d80edfc61b7..bb0c376b62b3 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig | |||
| @@ -466,7 +466,8 @@ CONFIG_FW_LOADER=y | |||
| 466 | # | 466 | # |
| 467 | # Plug and Play support | 467 | # Plug and Play support |
| 468 | # | 468 | # |
| 469 | # CONFIG_PNP is not set | 469 | CONFIG_PNP=y |
| 470 | CONFIG_PNPACPI=y | ||
| 470 | 471 | ||
| 471 | # | 472 | # |
| 472 | # Block devices | 473 | # Block devices |