Patchwork sfc: Fix dependency for SFC_MTD

login
register
mail settings
Submitter Ben Hutchings
Date Nov. 19, 2008, 8:53 p.m.
Message ID <20081119205353.GG8240@solarflare.com>
Download mbox | patch
Permalink /patch/9635/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ben Hutchings - Nov. 19, 2008, 8:53 p.m.
Randy Dunlap found that SFC_MTD was selected when sfc was built-in and
the MTD core was a module.  Don't allow that combination.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
 drivers/net/sfc/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Now with S-o-b; sorry for the spam.

Ben.
Randy Dunlap - Nov. 19, 2008, 9:37 p.m.
Ben Hutchings wrote:
> Randy Dunlap found that SFC_MTD was selected when sfc was built-in and
> the MTD core was a module.  Don't allow that combination.
> 
> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

I realized that this problem came up because SFC_MTD is a boolean
that depends on tristates, so the boolean is set (=y) when
SFC=y or SFC=m.  Thus extra handling for it is needed,
like Ben did here.

> ---
>  drivers/net/sfc/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> Now with S-o-b; sorry for the spam.
> 
> Ben.
> 
> diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
> index 3e25fb3..c535408 100644
> --- a/drivers/net/sfc/Kconfig
> +++ b/drivers/net/sfc/Kconfig
> @@ -14,7 +14,7 @@ config SFC
>  	  will be called sfc.
>  config SFC_MTD
>  	bool "Solarflare Solarstorm SFC4000 flash MTD support"
> -	depends on SFC && MTD
> +	depends on SFC && MTD && !(SFC=y && MTD=m)
>  	default y
>  	help
>  	  This exposes the on-board flash memory as an MTD device (e.g.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Nov. 20, 2008, 12:17 p.m.
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 19 Nov 2008 13:37:50 -0800

> Ben Hutchings wrote:
> > Randy Dunlap found that SFC_MTD was selected when sfc was built-in and
> > the MTD core was a module.  Don't allow that combination.
> > 
> > Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
> 
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
> 
> I realized that this problem came up because SFC_MTD is a boolean
> that depends on tristates, so the boolean is set (=y) when
> SFC=y or SFC=m.  Thus extra handling for it is needed,
> like Ben did here.

Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
index 3e25fb3..c535408 100644
--- a/drivers/net/sfc/Kconfig
+++ b/drivers/net/sfc/Kconfig
@@ -14,7 +14,7 @@  config SFC
 	  will be called sfc.
 config SFC_MTD
 	bool "Solarflare Solarstorm SFC4000 flash MTD support"
-	depends on SFC && MTD
+	depends on SFC && MTD && !(SFC=y && MTD=m)
 	default y
 	help
 	  This exposes the on-board flash memory as an MTD device (e.g.