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 git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
configs
/
sn2_defconfig
diff --git
a/arch/ia64/configs/sn2_defconfig
b/arch/ia64/configs/sn2_defconfig
index
449d3e7
..
75fd90d
100644
(file)
--- a/
arch/ia64/configs/sn2_defconfig
+++ b/
arch/ia64/configs/sn2_defconfig
@@
-26,6
+26,7
@@
CONFIG_TASK_IO_ACCOUNTING=y
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=20
+CONFIG_CGROUPS=y
CONFIG_CPUSETS=y
CONFIG_SYSFS_DEPRECATED=y
CONFIG_RELAY=y