summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-04-12 11:52:38 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-04-12 11:55:21 -0400
commit229e923f801f1fd0b7b5b360a9d6dff37821ca8e (patch)
treef18505dda708a3cfb29977975eea4d016536fe98
parente98edb5c673c95676ff26dd50d9d2b2fcb96de88 (diff)
downloadkernel-229e923f801f1fd0b7b5b360a9d6dff37821ca8e.tar.gz
kernel-229e923f801f1fd0b7b5b360a9d6dff37821ca8e.tar.xz
kernel-229e923f801f1fd0b7b5b360a9d6dff37821ca8e.zip
Enable CONFIG_LDM_PARTITION (rhbz 948636)
-rw-r--r--config-generic3
-rw-r--r--kernel.spec5
2 files changed, 6 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index e2be1bc44..7945f807f 100644
--- a/config-generic
+++ b/config-generic
@@ -3829,7 +3829,8 @@ CONFIG_AMIGA_PARTITION=y
CONFIG_BSD_DISKLABEL=y
CONFIG_EFI_PARTITION=y
CONFIG_KARMA_PARTITION=y
-# CONFIG_LDM_PARTITION is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
CONFIG_MAC_PARTITION=y
CONFIG_MSDOS_PARTITION=y
CONFIG_MINIX_SUBPARTITION=y
diff --git a/kernel.spec b/kernel.spec
index 5c8a8e54a..9badf2644 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2287,6 +2287,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Apr 12 2013 Josh Boyer <jwboyer@redhat.com>
+- Enable CONFIG_LDM_PARTITION (rhbz 948636)
+
* Fri Apr 12 2013 Justin M. Forbes <jforbes@redhat.com>
- Fix forcedeth DMA check error (rhbz 928024)