From 1093c7907b8583f97a8e9c8212c96040129a26e5 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Tue, 30 Oct 2012 10:46:47 -0400
Subject: [PATCH] enable CONFIG_MEDIA_{USB,PCI}_SUPPORT (rhbz 870457)

---
 config-generic | 2 ++
 kernel.spec    | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config-generic b/config-generic
index 4a8015fc7..3dcc83c06 100644
--- a/config-generic
+++ b/config-generic
@@ -2460,6 +2460,8 @@ CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_HANGCHECK_TIMER=m
 
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_MEDIA_PCI_SUPPORT=y
 #
 # Multimedia devices
 #
diff --git a/kernel.spec b/kernel.spec
index c56b1f537..3ed2c8e9b 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 2
+%global baserelease 3
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2317,6 +2317,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Oct 30 2012 Josh Boyer <jwboyer@redhat.com>
+- enable CONFIG_MEDIA_{USB,PCI}_SUPPORT (rhbz 870457)
+
 * Sat Oct 27 2012 Josh Boyer <jwboyer@redhat.com>
 - Update secure boot support for UEFI cert importing