diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-03-21 14:50:59 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-03-21 14:50:59 +0000 |
| commit | 4995f23669c83efb5fa07696dfbec3085f48adbd (patch) | |
| tree | da9f0472f4b93ccbb11f1d96a51ad454f017e6d7 /target | |
| parent | 76d1c0a067fb754c2212bd617b4a5b2987f1360e (diff) | |
| download | upstream-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')
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 |