You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
828 B
Diff
42 lines
828 B
Diff
11 years ago
|
--- 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 */
|