[kernel/f15] Fix config options in arm configs after latest commits

[Josh Boyer]

commit 2d4a348a915cfe70181d48e6b8f35657bfe45b8e
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Dec 20 09:31:40 2011 -0500

    Fix config options in arm configs after latest commits

 config-arm-omap-generic |    2 ++
 kernel.spec             |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index 6dc4523..912959b 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -1059,3 +1059,5 @@ CONFIG_LIBCRC32C=y
 # CONFIG_USB_HSO is not set
 
 CONFIG_CRYSTALHD=m
+
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
diff --git a/kernel.spec b/kernel.spec
index 22eaf3e..a36480d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # When changing real_sublevel below, reset this by hand to 1
 # (or to 0 and then use rpmdev-bumpspec).
 #
-%global baserelease 4
+%global baserelease 5
 %global fedora_build %{baserelease}
 
 # real_sublevel is the 3.x kernel version we're starting with
@@ -1984,6 +1984,9 @@ fi
 # and build.
 
 %changelog
+* Tue Dec 20 2011 Josh Boyer <jwboyer at redhat.com>
+- Fix config options in arm configs after latest commits
+
 * Mon Dec 19 2011 Dave Jones <davej at redhat.com>
 - x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT