aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-03-21 14:50:59 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-03-21 14:50:59 +0000
commit4995f23669c83efb5fa07696dfbec3085f48adbd (patch)
treeda9f0472f4b93ccbb11f1d96a51ad454f017e6d7 /target/linux/generic/patches-3.7
parent76d1c0a067fb754c2212bd617b4a5b2987f1360e (diff)
downloadupstream-4995f23669c83efb5fa07696dfbec3085f48adbd.tar.gz
upstream-4995f23669c83efb5fa07696dfbec3085f48adbd.tar.bz2
upstream-4995f23669c83efb5fa07696dfbec3085f48adbd.zip
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
Diffstat (limited to 'target/linux/generic/patches-3.7')
-rw-r--r--target/linux/generic/patches-3.7/259-regmap_dynamic.patch3
1 files changed, 2 insertions, 1 deletions
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 db67886ae7..6da165eefb 100644
--- 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