aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-05 13:33:44 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-01-05 13:33:44 +0000
commit2e8409cce38373d172e099cc7430ab68699b929f (patch)
treed34d712811a73a00cbd82131d102b9ddc13ddb8f /target/linux/generic/patches-3.3
parente6aac19237d1a480983fa486f9d8e3bee317d0f5 (diff)
downloadupstream-2e8409cce38373d172e099cc7430ab68699b929f.tar.gz
upstream-2e8409cce38373d172e099cc7430ab68699b929f.tar.bz2
upstream-2e8409cce38373d172e099cc7430ab68699b929f.zip
kernel: port the regmap fix to 3.6 (#12749), refresh patches for other versions
SVN-Revision: 35016
Diffstat (limited to 'target/linux/generic/patches-3.3')
-rw-r--r--target/linux/generic/patches-3.3/270-regmap_dynamic.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.3/270-regmap_dynamic.patch b/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
index a583cb4c40..43e13bc137 100644
--- a/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
+++ b/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
@@ -1,7 +1,5 @@
-Index: linux-3.3.8/drivers/base/regmap/Kconfig
-===================================================================
---- linux-3.3.8.orig/drivers/base/regmap/Kconfig 2013-01-04 23:40:36.288481779 +0100
-+++ linux-3.3.8/drivers/base/regmap/Kconfig 2013-01-04 23:40:39.760481927 +0100
+--- a/drivers/base/regmap/Kconfig
++++ b/drivers/base/regmap/Kconfig
@@ -3,16 +3,17 @@
# subsystems should select the appropriate symbols.
@@ -24,10 +22,8 @@ Index: linux-3.3.8/drivers/base/regmap/Kconfig
config REGMAP_IRQ
bool
-Index: linux-3.3.8/drivers/base/regmap/Makefile
-===================================================================
---- linux-3.3.8.orig/drivers/base/regmap/Makefile 2012-06-01 09:16:13.000000000 +0200
-+++ linux-3.3.8/drivers/base/regmap/Makefile 2013-01-05 00:20:31.236584162 +0100
+--- a/drivers/base/regmap/Makefile
++++ b/drivers/base/regmap/Makefile
@@ -1,6 +1,8 @@
-obj-$(CONFIG_REGMAP) += regmap.o regcache.o
-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o