kernel: REGMAP_SPI should only be selectable when SPI_MASTER is selected
This was turned from a silent confg option without a text to a normal config option which could be selected without any other option depending on this. This could cause the situation where REGMAP_SPI was selected without SPI_MASTER being selected. SVN-Revision: 36101
This commit is contained in:
parent
76d1c0a067
commit
4995f23669
4 changed files with 8 additions and 4 deletions
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/base/regmap/Kconfig
|
--- a/drivers/base/regmap/Kconfig
|
||||||
+++ b/drivers/base/regmap/Kconfig
|
+++ b/drivers/base/regmap/Kconfig
|
||||||
@@ -3,16 +3,17 @@
|
@@ -3,16 +3,18 @@
|
||||||
# subsystems should select the appropriate symbols.
|
# subsystems should select the appropriate symbols.
|
||||||
|
|
||||||
config REGMAP
|
config REGMAP
|
||||||
|
@ -18,6 +18,7 @@
|
||||||
config REGMAP_SPI
|
config REGMAP_SPI
|
||||||
- tristate
|
- tristate
|
||||||
+ select REGMAP
|
+ select REGMAP
|
||||||
|
+ depends on SPI_MASTER
|
||||||
+ tristate "Regmap SPI"
|
+ tristate "Regmap SPI"
|
||||||
|
|
||||||
config REGMAP_IRQ
|
config REGMAP_IRQ
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/base/regmap/Kconfig
|
--- a/drivers/base/regmap/Kconfig
|
||||||
+++ b/drivers/base/regmap/Kconfig
|
+++ b/drivers/base/regmap/Kconfig
|
||||||
@@ -3,20 +3,23 @@
|
@@ -3,20 +3,24 @@
|
||||||
# subsystems should select the appropriate symbols.
|
# subsystems should select the appropriate symbols.
|
||||||
|
|
||||||
config REGMAP
|
config REGMAP
|
||||||
|
@ -19,6 +19,7 @@
|
||||||
config REGMAP_SPI
|
config REGMAP_SPI
|
||||||
- tristate
|
- tristate
|
||||||
+ select REGMAP
|
+ select REGMAP
|
||||||
|
+ depends on SPI_MASTER
|
||||||
+ tristate "Regmap SPI"
|
+ tristate "Regmap SPI"
|
||||||
|
|
||||||
config REGMAP_MMIO
|
config REGMAP_MMIO
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/base/regmap/Kconfig
|
--- a/drivers/base/regmap/Kconfig
|
||||||
+++ b/drivers/base/regmap/Kconfig
|
+++ b/drivers/base/regmap/Kconfig
|
||||||
@@ -3,20 +3,23 @@
|
@@ -3,20 +3,24 @@
|
||||||
# subsystems should select the appropriate symbols.
|
# subsystems should select the appropriate symbols.
|
||||||
|
|
||||||
config REGMAP
|
config REGMAP
|
||||||
|
@ -19,6 +19,7 @@
|
||||||
config REGMAP_SPI
|
config REGMAP_SPI
|
||||||
- tristate
|
- tristate
|
||||||
+ select REGMAP
|
+ select REGMAP
|
||||||
|
+ depends on SPI_MASTER
|
||||||
+ tristate "Regmap SPI"
|
+ tristate "Regmap SPI"
|
||||||
|
|
||||||
config REGMAP_MMIO
|
config REGMAP_MMIO
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/base/regmap/Kconfig
|
--- a/drivers/base/regmap/Kconfig
|
||||||
+++ b/drivers/base/regmap/Kconfig
|
+++ b/drivers/base/regmap/Kconfig
|
||||||
@@ -3,20 +3,23 @@
|
@@ -3,20 +3,24 @@
|
||||||
# subsystems should select the appropriate symbols.
|
# subsystems should select the appropriate symbols.
|
||||||
|
|
||||||
config REGMAP
|
config REGMAP
|
||||||
|
@ -19,6 +19,7 @@
|
||||||
config REGMAP_SPI
|
config REGMAP_SPI
|
||||||
- tristate
|
- tristate
|
||||||
+ select REGMAP
|
+ select REGMAP
|
||||||
|
+ depends on SPI_MASTER
|
||||||
+ tristate "Regmap SPI"
|
+ tristate "Regmap SPI"
|
||||||
|
|
||||||
config REGMAP_MMIO
|
config REGMAP_MMIO
|
||||||
|
|
Loading…
Reference in a new issue