aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.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/0126-config-recreate-with-savedefconfig.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/0126-config-recreate-with-savedefconfig.patch')
-rw-r--r--target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch9
1 files changed, 7 insertions, 2 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch b/target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch
index e173b8c215..b4429748fd 100644
--- a/target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch
+++ b/target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch
@@ -1,12 +1,14 @@
-From b9054daf1190829201f0f8c099a699ac8cbe09ed Mon Sep 17 00:00:00 2001
+From d373452a8e28350103ada064054898c3b5445d06 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 12 Dec 2013 11:11:03 +0000
-Subject: [PATCH 126/174] config: recreate with savedefconfig
+Subject: [PATCH 126/196] config: recreate with savedefconfig
---
arch/arm/configs/bcmrpi_defconfig | 7 -------
1 file changed, 7 deletions(-)
+diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
+index d0328d8..75c17bc 100644
--- a/arch/arm/configs/bcmrpi_defconfig
+++ b/arch/arm/configs/bcmrpi_defconfig
@@ -734,14 +734,9 @@ CONFIG_SND_USB_CAIAQ=m
@@ -33,3 +35,6 @@ Subject: [PATCH 126/174] config: recreate with savedefconfig
CONFIG_UIO=m
CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
+--
+1.9.1
+