summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-11-20 04:17:42 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-20 04:17:42 -0800
commit8761169cf15fdc9336abfddbb9c8dda59d974190 (patch)
tree02ca463279a904539e23c4f60ae1c9dd9bfebd36 /drivers/net
parent47a1a1d4be2910b13a8e90f75c17e253c39531ff (diff)
downloadtalos-obmc-linux-8761169cf15fdc9336abfddbb9c8dda59d974190.tar.gz
talos-obmc-linux-8761169cf15fdc9336abfddbb9c8dda59d974190.zip
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sfc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
index 3e25fb38f739..c535408ad6be 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.
OpenPOWER on IntegriCloud