projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6]
/
arch
/
arm
/
configs
/
ixp4xx_defconfig
diff --git
a/arch/arm/configs/ixp4xx_defconfig
b/arch/arm/configs/ixp4xx_defconfig
index
4975b91
..
fac7c3b
100644
(file)
--- a/
arch/arm/configs/ixp4xx_defconfig
+++ b/
arch/arm/configs/ixp4xx_defconfig
@@
-206,10
+206,8
@@
CONFIG_BINFMT_ELF=y
#
# Power management options
#
-CONFIG_PM=y
-CONFIG_PM_LEGACY=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_APM=y
+# CONFIG_PM is not set
+# CONFIG_APM is not set
#
# Networking