From: Hauke Mehrtens Date: Thu, 21 Mar 2013 14:50:59 +0000 (+0000) Subject: kernel: REGMAP_SPI should only be selectable when SPI_MASTER is selected X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4995f23669c83efb5fa07696dfbec3085f48adbd;p=openwrt%2Fstaging%2Fansuel.git 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 --- 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