aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.9/259-regmap_dynamic.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-03-14 14:45:56 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-03-14 14:45:56 +0000
commitddc8718f7f4ef9723e026efac811d3338e6bcddb (patch)
tree08d6be7813310be182259388518215a17afcc18c /target/linux/generic/patches-3.9/259-regmap_dynamic.patch
parent6cb1f067dc42c4bffa8862448167486333d0227e (diff)
downloadmaster-187ad058-ddc8718f7f4ef9723e026efac811d3338e6bcddb.tar.gz
master-187ad058-ddc8718f7f4ef9723e026efac811d3338e6bcddb.tar.bz2
master-187ad058-ddc8718f7f4ef9723e026efac811d3338e6bcddb.zip
kernel: add support for 3.9-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36008 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.9/259-regmap_dynamic.patch')
-rw-r--r--target/linux/generic/patches-3.9/259-regmap_dynamic.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.9/259-regmap_dynamic.patch b/target/linux/generic/patches-3.9/259-regmap_dynamic.patch
new file mode 100644
index 0000000000..df8457ad69
--- /dev/null
+++ b/target/linux/generic/patches-3.9/259-regmap_dynamic.patch
@@ -0,0 +1,41 @@
+--- a/drivers/base/regmap/Kconfig
++++ b/drivers/base/regmap/Kconfig
+@@ -3,20 +3,23 @@
+ # subsystems should select the appropriate symbols.
+
+ config REGMAP
+- default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_MMIO || REGMAP_IRQ)
+ select LZO_COMPRESS
+ select LZO_DECOMPRESS
+ select IRQ_DOMAIN if REGMAP_IRQ
+- bool
++ tristate "Regmap"
+
+ config REGMAP_I2C
+- tristate
++ select REGMAP
++ tristate "Regmap I2C"
+
+ config REGMAP_SPI
+- tristate
++ select REGMAP
++ tristate "Regmap SPI"
+
+ config REGMAP_MMIO
++ select REGMAP
+ tristate
+
+ config REGMAP_IRQ
++ select REGMAP
+ bool
+--- a/include/linux/regmap.h
++++ b/include/linux/regmap.h
+@@ -45,7 +45,7 @@ struct reg_default {
+ unsigned int def;
+ };
+
+-#ifdef CONFIG_REGMAP
++#if IS_ENABLED(CONFIG_REGMAP)
+
+ enum regmap_endian {
+ /* Unspecified -> 0 -> Backwards compatible default */