aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6
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.6
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.6')
-rw-r--r--target/linux/generic/patches-3.6/270-regmap_dynamic.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.6/270-regmap_dynamic.patch b/target/linux/generic/patches-3.6/270-regmap_dynamic.patch
index d0c1a82b50..943e8706cd 100644
--- a/target/linux/generic/patches-3.6/270-regmap_dynamic.patch
+++ b/target/linux/generic/patches-3.6/270-regmap_dynamic.patch
@@ -35,3 +35,17 @@
enum regmap_endian {
/* Unspecified -> 0 -> Backwards compatible default */
+--- 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
+-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
++regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o
++ifdef CONFIG_DEBUG_FS
++regmap-core-objs += regmap-debugfs.o
++endif
++obj-$(CONFIG_REGMAP) += regmap-core.o
+ obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
+ obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
+ obj-$(CONFIG_REGMAP_MMIO) += regmap-mmio.o