summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-10-22 12:24:02 -0400
committerKyle McMartin <kyle@mcmartin.ca>2010-10-22 12:24:02 -0400
commitc22cea221f8de78ab36ce0f183b73c99031cc7dc (patch)
tree03d0921c8157e6a2e2dd113cfb3be75ccd1a9aaa /config-generic
parenta791768570bae98c698d212d363f6c36ac5d42e5 (diff)
downloadkernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.tar.gz
kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.tar.xz
kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.zip
start following git head again
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic6
1 files changed, 6 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index f834847ff..b97545100 100644
--- a/config-generic
+++ b/config-generic
@@ -3348,6 +3348,8 @@ CONFIG_EXOFS_FS=m
CONFIG_NILFS2_FS=m
CONFIG_LOGFS=m
CONFIG_CEPH_FS=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_CEPH_LIB=m
CONFIG_FSCACHE=m
CONFIG_FSCACHE_STATS=y
@@ -4334,3 +4336,7 @@ CONFIG_IR_STREAMZAP=m
# CONFIG_MFD_STMPE is not set
# CONFIG_MFD_MAX8998 is not set
# CONFIG_MFD_TPS6586X is not set
+
+CONFIG_SPARSE_RCU_POINTER=y
+
+# CONFIG_PM_OPP is not set