[kernel/f18] Enable CONFIG_LDM_PARTITION (rhbz 948636)

[Josh Boyer]

commit 8924cb541f969c40b817a88fc2418809f9ae2d33
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Apr 12 11:52:38 2013 -0400

    Enable CONFIG_LDM_PARTITION (rhbz 948636)

 config-generic |    3 ++-
 kernel.spec    |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/config-generic b/config-generic
index 5c137e6..6550abb 100644
--- a/config-generic
+++ b/config-generic
@@ -3778,7 +3778,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 3c1cfb7..de4d6a2 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 204
+%global baserelease 205
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2409,6 +2409,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Apr 12 2013 Josh Boyer <jwboyer at redhat.com>
+- Enable CONFIG_LDM_PARTITION (rhbz 948636)
+
 * Thu Apr 11 2013 Dave Jones <davej at redhat.com>
 - Print out some extra debug information when we hit bad page tables.