projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
mips
/
configs
/
db1xxx_defconfig
diff --git
a/arch/mips/configs/db1xxx_defconfig
b/arch/mips/configs/db1xxx_defconfig
index
46e8f76
..
3bdb72a
100644
(file)
--- a/
arch/mips/configs/db1xxx_defconfig
+++ b/
arch/mips/configs/db1xxx_defconfig
@@
-36,7
+36,7
@@
CONFIG_PCI=y
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
CONFIG_PCCARD=y
CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_PM
_RUNTIME
=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=y