aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-03-21 14:50:59 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-03-21 14:50:59 +0000
commitda8dfca256a2fa49d7ac6a5f117610a6ae5529b4 (patch)
treeb0250483b8d1190536d4eb352cd8ec00ed91c8de /target/linux/generic
parent6cce0f0ddb093c437e86d987f207eb75cd972dec (diff)
downloadmaster-187ad058-da8dfca256a2fa49d7ac6a5f117610a6ae5529b4.tar.gz
master-187ad058-da8dfca256a2fa49d7ac6a5f117610a6ae5529b4.tar.bz2
master-187ad058-da8dfca256a2fa49d7ac6a5f117610a6ae5529b4.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. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36101 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.3/270-regmap_dynamic.patch3
-rw-r--r--target/linux/generic/patches-3.7/259-regmap_dynamic.patch3
-rw-r--r--target/linux/generic/patches-3.8/259-regmap_dynamic.patch3
-rw-r--r--target/linux/generic/patches-3.9/259-regmap_dynamic.patch3
4 files changed, 8 insertions, 4 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 7c92793060..b1cfc8a628 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
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
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 53bfe38051..87c03f1ad3 100644
--- 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 480f2c181f..e1b0141a0e 100644
--- 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