From 0002af7a7dfe94595430885f161e9d49f4c3f1e8 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu, 18 Jan 2007 16:44:24 -0700
Subject: [PATCH] --- yaml --- r: 46460 b: refs/heads/master c:
 10fccf5fda7529258325769e9da136064b481aab h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/i386/defconfig | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4e51424ab484..acadfb4b0857 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5859554c3ad31b722f0b5a1d3a40e19d8ccedd0b
+refs/heads/master: 10fccf5fda7529258325769e9da136064b481aab
diff --git a/trunk/arch/i386/defconfig b/trunk/arch/i386/defconfig
index 3265208e5899..77927922dca5 100644
--- a/trunk/arch/i386/defconfig
+++ b/trunk/arch/i386/defconfig
@@ -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