| Message ID | efa33bcbd3441f281d56a929687d916966ab8eb4.1282150973.git.leann.ogasawara@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Leann Ogasawara |
| Headers | show |
diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 775f80c..3be1fc9 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -476,6 +476,7 @@ 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=m # CONFIG_CEPH_FS_PRETTYDEBUG is not set CONFIG_CFG80211=m CONFIG_CFG80211_DEBUGFS=y diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index a25b5ac..fffffa2 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -21,7 +21,6 @@ CONFIG_BLK_DEV_LOOP=m # CONFIG_BRIDGE_NF_EBTABLES is not set CONFIG_BSD_DISKLABEL=y CONFIG_BT=m -# CONFIG_CEPH_FS is not set # CONFIG_CFG80211_REG_DEBUG is not set # CONFIG_CGROUP_DEVICE is not set CONFIG_CHR_DEV_SCH=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 1cde1cb..87cb54c 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -20,7 +20,6 @@ CONFIG_BONDING=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BSD_DISKLABEL=y CONFIG_BT=m -CONFIG_CEPH_FS=m CONFIG_CGROUP_DEVICE=y CONFIG_CHR_DEV_SCH=m CONFIG_CPU_FREQ=y diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index 19e0a16..20fd36e 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -22,7 +22,6 @@ CONFIG_BONDING=m CONFIG_BRIDGE_NF_EBTABLES=m # CONFIG_BSD_DISKLABEL is not set # CONFIG_BT is not set -CONFIG_CEPH_FS=m # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CGROUP_DEVICE=y # CONFIG_CHR_DEV_SCH is not set
This reverts commit 2f34836212b3b3868922e62ff07d867c4aed77a6. ia64 is being decommissioned so drop this patch. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> --- debian.master/config/config.common.ports | 1 + debian.master/config/ia64/config.common.ia64 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/sparc/config.common.sparc | 1 - 4 files changed, 1 insertions(+), 3 deletions(-)