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.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36101 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 7c92793..b1cfc8a 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 db67886..6da165e 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 53bfe38..87c03f1 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 480f2c1..e1b0141 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