From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 20 Nov 2008 12:17:42 +0000 (-0800)
Subject: sfc: Fix dependency for SFC_MTD
X-Git-Tag: v2.6.29-rc1~581^2~621
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8761169cf15fdc9336abfddbb9c8dda59d974190;p=linux-2.6-omap-h63xx.git

sfc: Fix dependency for SFC_MTD

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
index 3e25fb38f73..c535408ad6b 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.