summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-10-30 10:46:47 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-10-30 10:46:47 -0400
commit1093c7907b8583f97a8e9c8212c96040129a26e5 (patch)
treeb2f44ff426edf0e8f06f713f419e953f96adfbfb
parent5e72ee302b9b69fafdab16730f979e73b808f9ec (diff)
downloadkernel-1093c7907b8583f97a8e9c8212c96040129a26e5.tar.gz
kernel-1093c7907b8583f97a8e9c8212c96040129a26e5.tar.xz
kernel-1093c7907b8583f97a8e9c8212c96040129a26e5.zip
enable CONFIG_MEDIA_{USB,PCI}_SUPPORT (rhbz 870457)
-rw-r--r--config-generic2
-rw-r--r--kernel.spec5
2 files changed, 6 insertions, 1 deletions
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