summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-09-14 13:15:17 -0400
committerDave Jones <davej@redhat.com>2012-09-14 13:15:17 -0400
commit96543424606f0607bfad22fa8d90185362ac34c6 (patch)
tree40eea0691d15d0dfdecc770fda903294d668dd02
parent702ef3485981a93dfc09073ac4e6226111e974cb (diff)
downloadkernel-96543424606f0607bfad22fa8d90185362ac34c6.tar.gz
kernel-96543424606f0607bfad22fa8d90185362ac34c6.tar.xz
kernel-96543424606f0607bfad22fa8d90185362ac34c6.zip
Reenable UBIFS (rhbz 823238)
-rw-r--r--config-generic6
-rw-r--r--kernel.spec3
-rw-r--r--mod-extra.list1
3 files changed, 9 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index d6cb2b7e9..422972e4a 100644
--- a/config-generic
+++ b/config-generic
@@ -3624,7 +3624,11 @@ CONFIG_DLM_DEBUG=y
CONFIG_GFS2_FS=m
CONFIG_GFS2_FS_LOCKING_DLM=y
-# CONFIG_UBIFS_FS is not set
+
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+# CONFIG_UBIFS_FS_DEBUG is not set
#
# Partition Types
diff --git a/kernel.spec b/kernel.spec
index a2161c730..82f09befc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2322,6 +2322,9 @@ fi
# || ||
%changelog
* Fri Sep 14 2012 Dave Jones <davej@redhat.com>
+- Reenable UBIFS (rhbz 823238)
+
+* Fri Sep 14 2012 Dave Jones <davej@redhat.com>
- Fix license tag. (rhbz 450492)
* Wed Sep 12 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc5.git2.1
diff --git a/mod-extra.list b/mod-extra.list
index b01f05eb4..124d74ef2 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -187,3 +187,4 @@ w1_smem.ko
w1_ds2431.ko
w1_ds2423.ko
w1_bq27000.ko
+ubifs.ko