summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2015-03-17 11:35:38 -0400
committerKyle McMartin <kmcmarti@redhat.com>2015-03-17 11:35:38 -0400
commit6d8ef07aa77144edbc94bf100de573a331f127cd (patch)
treeb03571b916ca3f427fe24e3f8a4bab68e49b2df9
parent139d2905d4a859652fb9955f3254c424501900ff (diff)
downloadkernel-6d8ef07aa77144edbc94bf100de573a331f127cd.tar.gz
kernel-6d8ef07aa77144edbc94bf100de573a331f127cd.tar.xz
kernel-6d8ef07aa77144edbc94bf100de573a331f127cd.zip
enable PCI_ECAM
-rw-r--r--config-generic2
-rw-r--r--kernel.spec5
2 files changed, 5 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index c84ee3f58..2e1410611 100644
--- a/config-generic
+++ b/config-generic
@@ -5442,3 +5442,5 @@ CONFIG_POWERCAP=y
# set in x86-generic presently
# CONFIG_TOUCHSCREEN_GOODIX is not set
+
+CONFIG_PCI_ECAM=y
diff --git a/kernel.spec b/kernel.spec
index b2d838a9d..b384e5e72 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,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
@@ -2255,8 +2255,9 @@ fi
#
#
%changelog
-* Tue Mar 17 2015 Kyle McMartin <kmcmarti@redhat.com> - 4.0.0-0.rc4.git0.2
+* Tue Mar 17 2015 Kyle McMartin <kmcmarti@redhat.com> - 4.0.0-0.rc4.git0.3
- Update kernel-arm64.patch, move EDAC to arm-generic, add EDAC_XGENE on arm64.
+- Add PCI_ECAM on generic, since it'll be selected most places anyway.
* Mon Mar 16 2015 Jarod Wilson <jwilson@fedoraproject.org>
- Fix bad variant usage in kernel dependencies