diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-05 13:33:44 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-05 13:33:44 +0000 |
| commit | bea9349879215a146978a6753a7bd1c5a9199a7d (patch) | |
| tree | 19976e61784f94c7937ce2703d6d1e8b83a23584 /target/linux/generic/patches-3.6 | |
| parent | 3dad88cbb5f0f786b75babce487b4b528d872d1d (diff) | |
| download | upstream-bea9349879215a146978a6753a7bd1c5a9199a7d.tar.gz upstream-bea9349879215a146978a6753a7bd1c5a9199a7d.tar.bz2 upstream-bea9349879215a146978a6753a7bd1c5a9199a7d.zip | |
kernel: port the regmap fix to 3.6 (#12749), refresh patches for other versions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35016 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6')
| -rw-r--r-- | target/linux/generic/patches-3.6/270-regmap_dynamic.patch | 14 |
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 |