aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.1/0078-config-Enable-ZSMALLOC-ZRAM-and-PGTABLE_MAPPING.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-10-26 09:01:05 +0000
committerJohn Crispin <john@openwrt.org>2015-10-26 09:01:05 +0000
commitbf28fb50bf705fdd12f749c57abce1796b8c1024 (patch)
treeea7c899e5461e9a403c8f17543cbe66f89ba2925 /target/linux/brcm2708/patches-4.1/0078-config-Enable-ZSMALLOC-ZRAM-and-PGTABLE_MAPPING.patch
parent63a50eeba30cb773e7abbd71c5e0727171ea740a (diff)
downloadupstream-bf28fb50bf705fdd12f749c57abce1796b8c1024.tar.gz
upstream-bf28fb50bf705fdd12f749c57abce1796b8c1024.tar.bz2
upstream-bf28fb50bf705fdd12f749c57abce1796b8c1024.zip
brcm2708: update 4.1 patches
As usual, this patches were taken (and rebased) from https://github.com/raspberrypi/linux/commits/rpi-4.1.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> SVN-Revision: 47258
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0078-config-Enable-ZSMALLOC-ZRAM-and-PGTABLE_MAPPING.patch')
-rw-r--r--target/linux/brcm2708/patches-4.1/0078-config-Enable-ZSMALLOC-ZRAM-and-PGTABLE_MAPPING.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0078-config-Enable-ZSMALLOC-ZRAM-and-PGTABLE_MAPPING.patch b/target/linux/brcm2708/patches-4.1/0078-config-Enable-ZSMALLOC-ZRAM-and-PGTABLE_MAPPING.patch
index 67fb65792d..e693eb8637 100644
--- a/target/linux/brcm2708/patches-4.1/0078-config-Enable-ZSMALLOC-ZRAM-and-PGTABLE_MAPPING.patch
+++ b/target/linux/brcm2708/patches-4.1/0078-config-Enable-ZSMALLOC-ZRAM-and-PGTABLE_MAPPING.patch
@@ -1,7 +1,7 @@
-From b0c824459ac639a528c6d1cfcbafdb9d88ec303b Mon Sep 17 00:00:00 2001
+From 860bf6384964fbbaf4ffddeffe7fc86ecf1b2d3f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 22 Mar 2015 13:33:23 +0000
-Subject: [PATCH 078/171] config: Enable ZSMALLOC, ZRAM and PGTABLE_MAPPING
+Subject: [PATCH 078/203] config: Enable ZSMALLOC, ZRAM and PGTABLE_MAPPING
---
arch/arm/configs/bcm2709_defconfig | 4 ++++
class="gd">--- sound/arm/bcm2835-vchiq.c | 5 ----- 1 file changed, 5 deletions(-) --- a/sound/arm/bcm2835-vchiq.c +++ b/sound/arm/bcm2835-vchiq.c @@ -596,11 +596,8 @@ int bcm2835_audio_set_params(bcm2835_als instance->result = -1; if (alsa_stream->chip->cea_chmap >= 0) { - LOG_INFO("Using application requested channel map: %d\n", - alsa_stream->chip->cea_chmap); chmap_value = (unsigned)alsa_stream->chip->cea_chmap << 24; } else { - LOG_INFO("Using fallback channel map.\n"); /* fallback layouts for applications which do not use chmap API */ chmap_value = 0x00; switch (channels) { @@ -617,8 +614,6 @@ int bcm2835_audio_set_params(bcm2835_als for (i = 0; i < 8; i++) chmap_value |= alsa_stream->chip->map_channels[i] << (i * 3); - LOG_INFO("Requesting AUDS channel map: 0x%lx\n", (long)chmap_value); - m.type = VC_AUDIO_MSG_TYPE_CONFIG; m.u.config.channels = channels; m.u.config.samplerate = samplerate;