aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/0035-Enable-multiple-ALSA-channels.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-09-27 19:10:51 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-09-27 19:10:51 +0000
commit6918ea2484861cbf806c812b95a814ab40063c05 (patch)
tree3f4d53baabebad9339cadd1bbfaaf07ed61b9c1e /target/linux/brcm2708/patches-3.10/0035-Enable-multiple-ALSA-channels.patch
parentff6b0d57b8e4dd9c72b13ac0586c523c8d6e8841 (diff)
downloadupstream-6918ea2484861cbf806c812b95a814ab40063c05.tar.gz
upstream-6918ea2484861cbf806c812b95a814ab40063c05.tar.bz2
upstream-6918ea2484861cbf806c812b95a814ab40063c05.zip
brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0035-Enable-multiple-ALSA-channels.patch')
-rw-r--r--target/linux/brcm2708/patches-3.10/0035-Enable-multiple-ALSA-channels.patch11
1 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0035-Enable-multiple-ALSA-channels.patch b/target/linux/brcm2708/patches-3.10/0035-Enable-multiple-ALSA-channels.patch
index 48584eff40..c0c7169b90 100644
--- a/target/linux/brcm2708/patches-3.10/0035-Enable-multiple-ALSA-channels.patch
+++ b/target/linux/brcm2708/patches-3.10/0035-Enable-multiple-ALSA-channels.patch
@@ -1,15 +1,17 @@
-From 10a2ded6cbf58da71121f0c7a35462f52f49dfae Mon Sep 17 00:00:00 2001
+From 2be2a87be13a5e4df2e3afb13a6089fcd7073906 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 17 Apr 2013 12:16:36 +0100
-Subject: [PATCH 035/174] Enable multiple ALSA channels
+Subject: [PATCH 035/196] Enable multiple ALSA channels
---
arch/arm/mach-bcm2708/bcm2708.c | 54 ++++++++++++++++++++++++++++++++++++-----
1 file changed, 48 insertions(+), 6 deletions(-)
+diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
+index ab8bac6..5a7437b 100644
--- a/arch/arm/mach-bcm2708/bcm2708.c
+++ b/arch/arm/mach-bcm2708/bcm2708.c
-@@ -471,12 +471,54 @@ struct platform_device bcm2708_powerman_
+@@ -471,12 +471,54 @@ struct platform_device bcm2708_powerman_device = {
static struct platform_device bcm2708_alsa_devices[] = {
@@ -70,3 +72,6 @@ Subject: [PATCH 035/174] Enable multiple ALSA channels
};
static struct resource bcm2708_spi_resources[] = {
+--
+1.9.1
+