diff options
author | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
commit | e5441232a81d01e2ed46d88e340a30fd6b15b012 (patch) | |
tree | e008cc6bd24a0e2c9b283d94a69f7a027bcfb856 /target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch | |
parent | 048910c4e07b6fae28513ce1dea62fe3b6bb03de (diff) | |
download | master-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.gz master-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.bz2 master-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.zip |
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch')
-rw-r--r-- | target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch b/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch index 8ff56329e0..7e90e2d88a 100644 --- a/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch +++ b/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch @@ -13,11 +13,9 @@ Signed-off-by: Grant Likely <grant.likely@linaro.org> arch/arm/mm/init.c | 2 ++ 2 files changed, 3 insertions(+) -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index d02ce70..4332e8d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1922,6 +1922,7 @@ config USE_OF +@@ -1923,6 +1923,7 @@ config USE_OF select IRQ_DOMAIN select OF select OF_EARLY_FLATTREE @@ -25,11 +23,9 @@ index d02ce70..4332e8d 100644 help Include support for flattened device tree machine descriptions. -diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c -index 804d615..2a77ba8 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c -@@ -323,6 +323,8 @@ void __init arm_memblock_init(struct meminfo *mi, +@@ -323,6 +323,8 @@ void __init arm_memblock_init(struct mem if (mdesc->reserve) mdesc->reserve(); @@ -38,6 +34,3 @@ index 804d615..2a77ba8 100644 /* * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory --- -1.7.10.4 - |