projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
arch
/
arm
/
configs
/
assabet_defconfig
diff --git
a/arch/arm/configs/assabet_defconfig
b/arch/arm/configs/assabet_defconfig
index
089c9d5
..
b1cd331
100644
(file)
--- a/
arch/arm/configs/assabet_defconfig
+++ b/
arch/arm/configs/assabet_defconfig
@@
-184,6
+184,7
@@
CONFIG_BINFMT_ELF=y
# Power management options
#
CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
# CONFIG_APM is not set
#