From 67961be31e47c86911f73d82efbaafa727235dbf Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 20 Nov 2008 04:17:42 -0800
Subject: [PATCH] --- yaml --- r: 121947 b: refs/heads/master c:
 8761169cf15fdc9336abfddbb9c8dda59d974190 h: refs/heads/master i:   121945:
 e145ad608358a9c4e45fd860a74efe5dfca9cd23   121943:
 0a2236815fbcb63a907a1d7db2c982fde7841662 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/sfc/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c6cae8ec220..202fbe469364 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47a1a1d4be2910b13a8e90f75c17e253c39531ff
+refs/heads/master: 8761169cf15fdc9336abfddbb9c8dda59d974190
diff --git a/trunk/drivers/net/sfc/Kconfig b/trunk/drivers/net/sfc/Kconfig
index 3e25fb38f739..c535408ad6be 100644
--- a/trunk/drivers/net/sfc/Kconfig
+++ b/trunk/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.