summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-21 14:50:59 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-21 14:50:59 +0000
commit021be7825deb2b4706f3c54299358ddce9500975 (patch)
treeb0250483b8d1190536d4eb352cd8ec00ed91c8de /target/linux/generic/patches-3.3
parentdaf061c310a84fb86ccd8776589f9eefe4939642 (diff)
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
Diffstat (limited to 'target/linux/generic/patches-3.3')
-rw-r--r--target/linux/generic/patches-3.3/270-regmap_dynamic.patch3
1 files changed, 2 insertions, 1 deletions
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 7c9279306..b1cfc8a62 100644
--- 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