diff options
| author | Florian Fainelli <florian@openwrt.org> | 2013-01-08 22:19:31 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2013-01-08 22:19:31 +0000 |
| commit | 8dbed04ec9cad7771590af557b9edfe8e04bca8c (patch) | |
| tree | 412beb5055a726a8f371c35580bdc85300e4e2f7 /target/linux/generic/patches-3.8/259-regmap_dynamic.patch | |
| parent | c38cb63808ff1a395dd0384af23773b044adf9cb (diff) | |
| download | upstream-8dbed04ec9cad7771590af557b9edfe8e04bca8c.tar.gz upstream-8dbed04ec9cad7771590af557b9edfe8e04bca8c.tar.bz2 upstream-8dbed04ec9cad7771590af557b9edfe8e04bca8c.zip | |
kernel: add support for 3.8-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 35055
Diffstat (limited to 'target/linux/generic/patches-3.8/259-regmap_dynamic.patch')
| -rw-r--r-- | target/linux/generic/patches-3.8/259-regmap_dynamic.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.8/259-regmap_dynamic.patch b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch new file mode 100644 index 0000000000..a6b4df4fb2 --- /dev/null +++ b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch @@ -0,0 +1,55 @@ +--- 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 +@@ -44,7 +44,7 @@ struct reg_default { + unsigned int def; + }; + +-#ifdef CONFIG_REGMAP ++#if IS_ENABLED(CONFIG_REGMAP) + + 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 |