git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sh/driver-core'
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
n770_defconfig
diff --git
a/arch/arm/configs/n770_defconfig
b/arch/arm/configs/n770_defconfig
index
a1657b7
..
de0c28a
100644
(file)
--- a/
arch/arm/configs/n770_defconfig
+++ b/
arch/arm/configs/n770_defconfig
@@
-210,7
+210,6
@@
CONFIG_OMAP_ARM_216MHZ=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
@@
-309,6
+308,7
@@
CONFIG_PM_SLEEP=y
CONFIG_SUSPEND_UP_POSSIBLE=y
CONFIG_SUSPEND=y
# CONFIG_APM_EMULATION is not set
+CONFIG_PM_RUNTIME=y
#
# Networking