diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 22:55:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 22:55:39 +0000 |
| commit | 2644af4717cf9cc3cf89564ca017f596a7dcad05 (patch) | |
| tree | 7f2121f700446e60159a365094fdc6eea16d5cb7 /target/linux/generic/patches-3.18/259-regmap_dynamic.patch | |
| parent | 5e558fcd48c8c4acb87fe7bcf3eb2a66bb279503 (diff) | |
| download | master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.gz master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.bz2 master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.zip | |
kernel: make the kernel 3.18 patches apply and boot on arm.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43095 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/259-regmap_dynamic.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/259-regmap_dynamic.patch | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.18/259-regmap_dynamic.patch b/target/linux/generic/patches-3.18/259-regmap_dynamic.patch index e7f5bcee97..55e639cb85 100644 --- a/target/linux/generic/patches-3.18/259-regmap_dynamic.patch +++ b/target/linux/generic/patches-3.18/259-regmap_dynamic.patch @@ -1,6 +1,6 @@ --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig -@@ -3,23 +3,28 @@ +@@ -3,26 +3,31 @@ # subsystems should select the appropriate symbols. config REGMAP @@ -13,18 +13,21 @@ config REGMAP_I2C - tristate -+ select REGMAP + tristate "Regmap I2C ++ select REGMAP + depends on I2C config REGMAP_SPI - tristate ++ tristate "Regmap SPI" + select REGMAP + depends on SPI_MASTER -+ tristate "Regmap SPI" + depends on SPI config REGMAP_SPMI + select REGMAP tristate + depends on SPMI config REGMAP_MMIO + select REGMAP @@ -67,8 +70,8 @@ +#include <linux/module.h> #include <linux/mutex.h> #include <linux/err.h> - #include <linux/rbtree.h> -@@ -2247,3 +2248,5 @@ static int __init regmap_initcall(void) + #include <linux/of.h> +@@ -2635,3 +2636,5 @@ static int __init regmap_initcall(void) return 0; } postcore_initcall(regmap_initcall); |