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

diff --git a/target/linux/generic/patches-3.3/270-regmap_dynamic.patch b/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
index 7c927930605f127ddce78c8907d2ae33131f0784..b1cfc8a6281db22cd37723649ab49c5faf97544a 100644 (file)
--- a/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
+++ b/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
@@ -1,6 +1,6 @@
 --- a/drivers/base/regmap/Kconfig
 +++ b/drivers/base/regmap/Kconfig
-@@ -3,16 +3,17 @@
+@@ -3,16 +3,18 @@
  # subsystems should select the appropriate symbols.
  
  config REGMAP
@@ -18,6 +18,7 @@
  config REGMAP_SPI
 -      tristate
 +      select REGMAP
++      depends on SPI_MASTER
 +      tristate "Regmap SPI"
  
  config REGMAP_IRQ

diff --git a/target/linux/generic/patches-3.7/259-regmap_dynamic.patch b/target/linux/generic/patches-3.7/259-regmap_dynamic.patch
index db67886ae73c98813687d947b89c513f16db7fe6..6da165eefb7929e3fe1aabddd27f38d216c13ee2 100644 (file)
--- a/target/linux/generic/patches-3.7/259-regmap_dynamic.patch
+++ b/target/linux/generic/patches-3.7/259-regmap_dynamic.patch
@@ -1,6 +1,6 @@
 --- a/drivers/base/regmap/Kconfig
 +++ b/drivers/base/regmap/Kconfig
-@@ -3,20 +3,23 @@
+@@ -3,20 +3,24 @@
  # subsystems should select the appropriate symbols.
  
  config REGMAP
@@ -19,6 +19,7 @@
  config REGMAP_SPI
 -      tristate
 +      select REGMAP
++      depends on SPI_MASTER
 +      tristate "Regmap SPI"
  
  config REGMAP_MMIO

diff --git a/target/linux/generic/patches-3.8/259-regmap_dynamic.patch b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch
index 53bfe3805184a102700b50f83cb85b86909dcb81..87c03f1ad3675bea80f73309c2bb21024998fea8 100644 (file)
--- a/target/linux/generic/patches-3.8/259-regmap_dynamic.patch
+++ b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch
@@ -1,6 +1,6 @@
 --- a/drivers/base/regmap/Kconfig
 +++ b/drivers/base/regmap/Kconfig
-@@ -3,20 +3,23 @@
+@@ -3,20 +3,24 @@
  # subsystems should select the appropriate symbols.
  
  config REGMAP
@@ -19,6 +19,7 @@
  config REGMAP_SPI
 -      tristate
 +      select REGMAP
++      depends on SPI_MASTER
 +      tristate "Regmap SPI"
  
  config REGMAP_MMIO

diff --git a/target/linux/generic/patches-3.9/259-regmap_dynamic.patch b/target/linux/generic/patches-3.9/259-regmap_dynamic.patch
index 480f2c181f91756ba9585aab8e76165da62521ed..e1b0141a0e700ad043258b7f4dc17877c3fd6788 100644 (file)
--- a/target/linux/generic/patches-3.9/259-regmap_dynamic.patch
+++ b/target/linux/generic/patches-3.9/259-regmap_dynamic.patch
@@ -1,6 +1,6 @@
 --- a/drivers/base/regmap/Kconfig
 +++ b/drivers/base/regmap/Kconfig
-@@ -3,20 +3,23 @@
+@@ -3,20 +3,24 @@
  # subsystems should select the appropriate symbols.
  
  config REGMAP
@@ -19,6 +19,7 @@
  config REGMAP_SPI
 -      tristate
 +      select REGMAP
++      depends on SPI_MASTER
 +      tristate "Regmap SPI"
  
  config REGMAP_MMIO