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
/
arm
/
configs
/
marzen_defconfig
diff --git
a/arch/arm/configs/marzen_defconfig
b/arch/arm/configs/marzen_defconfig
index
ff91630
..
3c8b6d8
100644
(file)
--- a/
arch/arm/configs/marzen_defconfig
+++ b/
arch/arm/configs/marzen_defconfig
@@
-33,7
+33,7
@@
CONFIG_ARM_APPENDED_DTB=y
CONFIG_VFP=y
CONFIG_KEXEC=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM
_RUNTIME
=y
+CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y