netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Allow building iwl3945 without iwl4965.
@ 2008-04-26 22:27 Jason Riedy
  2008-04-27 22:43 ` David Miller
  2008-04-29  2:19 ` Zhu Yi
  0 siblings, 2 replies; 18+ messages in thread
From: Jason Riedy @ 2008-04-26 22:27 UTC (permalink / raw)
  To: Zhu Yi, David S. Miller; +Cc: netdev

If IWL3945 ever depends on IWLCORE, the silent, user-invisible
IWLWIFI option can go away.

Signed-off-by: Jason Riedy <jason@acm.org>
---
   The breakage made it to Linus's tree but isn't in the wireless forest
   (as far as I can see).  Commit 49186b4a083655 is a "part 2" without
   a "part 1", so perhaps that "part 1" avoided the problem?

 drivers/net/wireless/Makefile        |    2 +-
 drivers/net/wireless/iwlwifi/Kconfig |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index c2642bc..2c343aa 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -56,7 +56,7 @@ obj-$(CONFIG_RTL8187)	+= rtl8187.o
 
 obj-$(CONFIG_ADM8211)	+= adm8211.o
 
-obj-$(CONFIG_IWLCORE)	+= iwlwifi/
+obj-$(CONFIG_IWLWIFI)	+= iwlwifi/
 obj-$(CONFIG_RT2X00)	+= rt2x00/
 
 obj-$(CONFIG_P54_COMMON)	+= p54/
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index c4e631d..9a25f55 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,6 +1,11 @@
+config IWLWIFI
+	bool
+	default n
+
 config IWLCORE
 	tristate "Intel Wireless Wifi Core"
 	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+	select IWLWIFI
 
 config IWLWIFI_LEDS
 	bool
@@ -106,6 +111,7 @@ config IWL3945
 	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
 	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
 	select FW_LOADER
+	select IWLWIFI
 	---help---
 	  Select to build the driver supporting the:
 
-- 
1.5.5.rc1.121.g1594


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2008-05-06  7:05 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-26 22:27 [PATCH] Allow building iwl3945 without iwl4965 Jason Riedy
2008-04-27 22:43 ` David Miller
2008-04-29  2:19 ` Zhu Yi
2008-04-29 13:27   ` John W. Linville
2008-04-30  2:14     ` Zhu Yi
2008-04-30  2:17       ` David Miller
2008-04-30  2:31         ` Zhu Yi
2008-04-30  2:32           ` David Miller
2008-04-30  4:46             ` Bill Fink
2008-04-30  2:36       ` Randy.Dunlap
2008-04-30  9:34         ` Zhu Yi
2008-05-02 15:07           ` Sam Ravnborg
2008-05-04  1:50             ` Zhu Yi
2008-05-05 18:25   ` [2.6 patch] make IWLWIFI a tristate Adrian Bunk
2008-05-05 19:40     ` David Miller
2008-05-05 19:42       ` Adrian Bunk
2008-05-06  1:26     ` Zhu Yi
2008-05-06  7:05       ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).