summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2011-01-31 09:52:08 -0500
committerChuck Ebbert <cebbert@redhat.com>2011-01-31 09:52:08 -0500
commitf8eae5b665c52b5efd29306320eb42b393754bfd (patch)
tree35fafe6e9b024fd50f5fa6cd8be0d003c95734a7 /kernel.spec
parent3a78e4bfdec1e658f086d2050a645a9d620528f8 (diff)
downloadkernel-f8eae5b665c52b5efd29306320eb42b393754bfd.tar.gz
kernel-f8eae5b665c52b5efd29306320eb42b393754bfd.tar.xz
kernel-f8eae5b665c52b5efd29306320eb42b393754bfd.zip
Fix build failure on s390.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec10
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index b4a39ff10..21ba5c031 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -731,6 +731,8 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
+Patch12430: can-softing-depend-on-iomem.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1343,6 +1345,9 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
# rhbz#662344,600690
ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
+# Fix build failure on s390
+ApplyPatch can-softing-depend-on-iomem.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -1955,6 +1960,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Jan 31 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc2.git7.2
+- Fix build failure on s390.
+
* Fri Jan 28 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc2.git7.1
- Linux 2.6.38-rc2-git7