OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 19... Line 19...
19 19
20 config REGMAP 20 config REGMAP
21 - default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ) 21 - default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
22 select IRQ_DOMAIN if REGMAP_IRQ 22 select IRQ_DOMAIN if REGMAP_IRQ
23 - bool 23 - bool
Line 24... Line 24...
24 + tristate 24 + tristate "Regmap"
25 25
26 config REGCACHE_COMPRESSED 26 config REGCACHE_COMPRESSED
-   27 select LZO_COMPRESS
Line 27... Line 28...
27 select LZO_COMPRESS 28 @@ -17,23 +16,30 @@ config REGMAP_AC97
28 @@ -18,22 +17,29 @@ config REGMAP_AC97 29 tristate
-   30
29 31 config REGMAP_I2C
30 config REGMAP_I2C 32 - tristate
Line 31... Line 33...
31 tristate 33 + tristate "Regmap I2C"
32 + select REGMAP 34 + select REGMAP
-   35 depends on I2C
33 depends on I2C 36
34 37 config REGMAP_SPI
35 config REGMAP_SPI 38 - tristate
Line 36... Line 39...
36 tristate 39 + tristate "Regmap SPI"
Line 47... Line 50...
47 + select REGMAP 50 + select REGMAP
48 tristate 51 tristate
49 depends on W1 52 depends on W1
Line 50... Line 53...
50 53
51 config REGMAP_MMIO 54 config REGMAP_MMIO
-   55 - tristate
52 tristate 56 + tristate "Regmap MMIO"
Line 53... Line 57...
53 + select REGMAP 57 + select REGMAP
54 58
55 config REGMAP_IRQ 59 config REGMAP_IRQ
Line 97... Line 101...
97 @@ -139,7 +139,7 @@ struct reg_sequence { 101 @@ -139,7 +139,7 @@ struct reg_sequence {
98 pollret ?: ((cond) ? 0 : -ETIMEDOUT); \ 102 pollret ?: ((cond) ? 0 : -ETIMEDOUT); \
99 }) 103 })
Line 100... Line 104...
100 104
101 -#ifdef CONFIG_REGMAP 105 -#ifdef CONFIG_REGMAP
Line 102... Line 106...
102 +#if IS_REACHABLE(CONFIG_REGMAP) 106 +#if IS_ENABLED(CONFIG_REGMAP)
103 107