>From 383f79463051eb1b2dad64d7ae34b1f156befcbb Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Sun, 23 May 2010 11:08:25 -0700
Subject: [PATCH 1/6] UBUNTU: [Config] Enable CONFIG_CEPH_FS=m

Enable CONFIG_CEPH_FS=m for ports and ubuntu. Per our config selection
criteria, "if the option creates a new subsystem (or filesystem) we will
enable it". Ceph is an extremely scalable file system designed to
provide high performance, reliable access to petabytes of storage.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
debian.master/config/config.common.ports | 3 ++-
debian.master/config/config.common.ubuntu | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index ef881ea..9bff3f8 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -455,7 +455,8 @@ CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-# CONFIG_CEPH_FS is not set
+CONFIG_CEPH_FS=m
+# CONFIG_CEPH_FS_PRETTYDEBUG is not set
CONFIG_CFG80211=m
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 552f85f..150d5a2 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -523,7 +523,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-# CONFIG_CEPH_FS is not set
+CONFIG_CEPH_FS=m
+# CONFIG_CEPH_FS_PRETTYDEBUG is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
CONFIG_CFG80211=m
--
1.7.0.4




--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team