projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '83xx' into for_paulus
[linux-drm-fsl-dcu.git]
/
arch
/
i386
/
defconfig
diff --git
a/arch/i386/defconfig
b/arch/i386/defconfig
index 5d80edfc61b7f61f36ed0183c886921c8a79ffd1..bb0c376b62b32fcc8ee934ce281676908b6fd150 100644
(file)
--- a/
arch/i386/defconfig
+++ b/
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