Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2014-08-18 16:13:21 +0200
committerJiri Slaby <jslaby@suse.cz>2014-08-18 16:13:21 +0200
commit2a23faf8f06e5c694c3c66b3c7eebb304caeb3b8 (patch)
treec8929bcc3c1ca070593a797b8d2bef43a6c4527b
parent84ffa90b5adef5041cfdd51f3e3731e76e9172f2 (diff)
parent32dedf2e653a447932dd111e992e8250cd6dfa0e (diff)
Merge remote-tracking branch 'origin/master' into stable
-rw-r--r--config/armv6hl/default4
-rw-r--r--rpm/kernel-binary.spec.in6
-rw-r--r--rpm/kernel-obs-build.spec.in4
3 files changed, 7 insertions, 7 deletions
diff --git a/config/armv6hl/default b/config/armv6hl/default
index 41e85a1887..25d4b184b0 100644
--- a/config/armv6hl/default
+++ b/config/armv6hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.16.0 Kernel Configuration
+# Linux/arm 3.16.1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -4681,7 +4681,7 @@ CONFIG_MX3_IPU_IRQS=4
CONFIG_IMX_SDMA=m
CONFIG_IMX_DMA=m
CONFIG_DMA_OMAP=y
-# CONFIG_DMA_BCM2835 is not set
+CONFIG_DMA_BCM2835=m
CONFIG_TI_CPPI41=m
# CONFIG_FSL_EDMA is not set
CONFIG_DMA_ENGINE=y
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index f714ea33e9..5dd74f927d 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -27,9 +27,9 @@
%include %_sourcedir/kernel-spec-macros
%define build_flavor @FLAVOR@
-%define build_default (%build_flavor == "default")
-%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
-%define build_vanilla (%build_flavor == "vanilla")
+%define build_default ("%build_flavor" == "default")
+%define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2")
+%define build_vanilla ("%build_flavor" == "vanilla")
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
diff --git a/rpm/kernel-obs-build.spec.in b/rpm/kernel-obs-build.spec.in
index 49a1d62175..ac42e13d2f 100644
--- a/rpm/kernel-obs-build.spec.in
+++ b/rpm/kernel-obs-build.spec.in
@@ -34,7 +34,7 @@ BuildRequires: kernel-default
BuildRequires: kernel-xen
%endif
ExclusiveArch: @ARCHS@
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1315
# For SLE 11
BuildRequires: mkinitrd
BuildRequires: perl-Bootloader
@@ -105,7 +105,7 @@ ROOT=""
%define kernel_name Image
%endif
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1315
# For SLE 11
/sbin/mkinitrd $ROOT \
-m "$KERNEL_MODULES" \