Skip to contentSkip to conversation

sfc: Fix dependency for SFC_MTD

PATCH Applied Ben Hutchings 3 participants 4 messages Nov 19, 2008 – Nov 20, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/net/sfc/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/sfc/Kconfig +1 -1
index 3e25fb3..c535408 100644
@@ -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.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
#1 lore raw

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.

---
 drivers/net/sfc/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

Ben.

drivers/net/sfc/Kconfig +1 -1
index 3e25fb3..c535408 100644
@@ -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.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
Acked-by
#2 lore raw
Quoted 4 lines · Ben Hutchings

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.

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.

Quoted 21 lines
---
 drivers/net/sfc/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

Ben.

drivers/net/sfc/Kconfig +1 -1
index 3e25fb3..c535408 100644
@@ -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.
maintainer Applied
#3 lore raw

From: Randy Dunlap <[email protected]>
Date: Wed, 19 Nov 2008 13:37:50 -0800

Quoted 4 lines
Quoted 3 lines · Ben Hutchings

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.

Quoted 8 lines
Quoted 1 line

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.