kernel: Build: Split kmod-regmap

[openwrt/staging/wigyori.git] / target / linux / generic / hack-4.14 / 259-regmap_dynamic.patch

diff --git a/target/linux/generic/hack-4.14/259-regmap_dynamic.patch b/target/linux/generic/hack-4.14/259-regmap_dynamic.patch
index 1c6e78df3099fda1bdb98e2d6980be3bb206fa5d..59dfbf3ad2dcc6caf6fa4e00adb88c5ad08492f3 100644 (file)
--- a/target/linux/generic/hack-4.14/259-regmap_dynamic.patch
+++ b/target/linux/generic/hack-4.14/259-regmap_dynamic.patch
@@ -21,22 +21,19 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -      default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
        select IRQ_DOMAIN if REGMAP_IRQ
 -      bool
-+      tristate "Regmap"
++      tristate
  
  config REGCACHE_COMPRESSED
        select LZO_COMPRESS
-@@ -17,23 +16,30 @@ config REGMAP_AC97
-       tristate
+@@ -18,22 +17,29 @@ config REGMAP_AC97
  
  config REGMAP_I2C
--      tristate
-+      tristate "Regmap I2C"
+       tristate
 +      select REGMAP
        depends on I2C
  
  config REGMAP_SPI
--      tristate
-+      tristate "Regmap SPI"
+       tristate
 +      select REGMAP
 +      depends on SPI_MASTER
        depends on SPI
@@ -52,8 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        depends on W1
  
  config REGMAP_MMIO
--      tristate
-+      tristate "Regmap MMIO"
+       tristate
 +      select REGMAP
  
  config REGMAP_IRQ
@@ -103,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  })
  
 -#ifdef CONFIG_REGMAP
-+#if IS_ENABLED(CONFIG_REGMAP)
++#if IS_REACHABLE(CONFIG_REGMAP)
  
  enum regmap_endian {
        /* Unspecified -> 0 -> Backwards compatible default */