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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  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
  1 sibling, 0 replies; 18+ messages in thread
From: David Miller @ 2008-04-27 22:43 UTC (permalink / raw)
  To: jason; +Cc: yi.zhu, netdev

From: Jason Riedy <jason@acm.org>
Date: Sat, 26 Apr 2008 15:27:43 -0700

> If IWL3945 ever depends on IWLCORE, the silent, user-invisible
> IWLWIFI option can go away.
> 
> Signed-off-by: Jason Riedy <jason@acm.org>

Patch applied, thanks a lot jason.

>    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?

No, the "part 1" is exactly the patch posted by Tomas Winkler
and referenced in the 49186b4a083655 commit, which is:

commit d7d313000ba2fc94a5383511a17ff38a39bab928
Author: Tomas Winkler <tomas.winkler@intel.com>
Date:   Wed Apr 23 03:48:57 2008 -0700

    iwlwifi: Fix built-in compilation of iwlcore
    
    This patch fixes problem in Makefile that prevented
    built-in compilation of iwlcore
    
    Commit that caused this problem: eadd3c4b ("iwlwifi: make Makefile
    more concise")
    
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Yi Zhu <yi.zhu@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 4f3e88b..ec6187b 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_IWLCORE)	:= iwlcore.o
+obj-$(CONFIG_IWLCORE)	+= iwlcore.o
 iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o
 iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o

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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  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-05-05 18:25   ` [2.6 patch] make IWLWIFI a tristate Adrian Bunk
  1 sibling, 2 replies; 18+ messages in thread
From: Zhu Yi @ 2008-04-29  2:19 UTC (permalink / raw)
  To: Jason Riedy; +Cc: David S. Miller, netdev

On Sat, 2008-04-26 at 15:27 -0700, Jason Riedy wrote:
> 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:

Do we have a way to make "select IWLWIFI" generate CONFIG_IWLWIFI with
the same state as CONFIG_IWLCORE (or CONFIG_IWL3945)? AFAICS,
CONFIG_IWLWIFI is always 'y' whenever CONFIG_IWLCORE is 'y' or 'm'. If
the latter is 'm', the Makefile will generate a empty built-in.o which
requires vmlinux to update unnecessarily every time we only compile
iwl3945/4965 modules.

Thanks,
-yi


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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  2008-04-29  2:19 ` Zhu Yi
@ 2008-04-29 13:27   ` John W. Linville
  2008-04-30  2:14     ` Zhu Yi
  2008-05-05 18:25   ` [2.6 patch] make IWLWIFI a tristate Adrian Bunk
  1 sibling, 1 reply; 18+ messages in thread
From: John W. Linville @ 2008-04-29 13:27 UTC (permalink / raw)
  To: Zhu Yi; +Cc: Jason Riedy, David S. Miller, netdev

On Tue, Apr 29, 2008 at 10:19:57AM +0800, Zhu Yi wrote:

> Do we have a way to make "select IWLWIFI" generate CONFIG_IWLWIFI with
> the same state as CONFIG_IWLCORE (or CONFIG_IWL3945)? AFAICS,
> CONFIG_IWLWIFI is always 'y' whenever CONFIG_IWLCORE is 'y' or 'm'. If
> the latter is 'm', the Makefile will generate a empty built-in.o which
> requires vmlinux to update unnecessarily every time we only compile
> iwl3945/4965 modules.

Can you do something like  "default IWLCORE'?  Untested, off the top
of my head...

John
-- 
John W. Linville
linville@tuxdriver.com

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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  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:36       ` Randy.Dunlap
  0 siblings, 2 replies; 18+ messages in thread
From: Zhu Yi @ 2008-04-30  2:14 UTC (permalink / raw)
  To: John W. Linville; +Cc: Jason Riedy, David S. Miller, netdev

On Tue, 2008-04-29 at 09:27 -0400, John W. Linville wrote:
> 
> > Do we have a way to make "select IWLWIFI" generate CONFIG_IWLWIFI
> with
> > the same state as CONFIG_IWLCORE (or CONFIG_IWL3945)? AFAICS,
> > CONFIG_IWLWIFI is always 'y' whenever CONFIG_IWLCORE is 'y' or 'm'.
> If
> > the latter is 'm', the Makefile will generate a empty built-in.o
> which
> > requires vmlinux to update unnecessarily every time we only compile
> > iwl3945/4965 modules.
> 
> Can you do something like  "default IWLCORE'?  Untested, off the top
> of my head...

I just realized the kernel now updates vmlinux when I type 'make' even
if nothing is changed in the source code. Is this a bug or feature?

Thanks,
-yi


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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  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:36       ` Randy.Dunlap
  1 sibling, 1 reply; 18+ messages in thread
From: David Miller @ 2008-04-30  2:17 UTC (permalink / raw)
  To: yi.zhu; +Cc: linville, jason, netdev

From: Zhu Yi <yi.zhu@intel.com>
Date: Wed, 30 Apr 2008 10:14:39 +0800

> I just realized the kernel now updates vmlinux when I type 'make' even
> if nothing is changed in the source code. Is this a bug or feature?

The build number increments every time you make.

That's where the "#nn" in the uname output comes from.

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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  2008-04-30  2:17       ` David Miller
@ 2008-04-30  2:31         ` Zhu Yi
  2008-04-30  2:32           ` David Miller
  0 siblings, 1 reply; 18+ messages in thread
From: Zhu Yi @ 2008-04-30  2:31 UTC (permalink / raw)
  To: David Miller; +Cc: linville, jason, netdev

On Tue, 2008-04-29 at 19:17 -0700, David Miller wrote:
> The build number increments every time you make.
> 
> That's where the "#nn" in the uname output comes from.

Well, if nothing is changed, why it tries to recompile the image? IIRC,
we don't have this problem in early kernels.

Thanks,
-yi


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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  2008-04-30  2:31         ` Zhu Yi
@ 2008-04-30  2:32           ` David Miller
  2008-04-30  4:46             ` Bill Fink
  0 siblings, 1 reply; 18+ messages in thread
From: David Miller @ 2008-04-30  2:32 UTC (permalink / raw)
  To: yi.zhu; +Cc: linville, jason, netdev

From: Zhu Yi <yi.zhu@intel.com>
Date: Wed, 30 Apr 2008 10:31:07 +0800

> On Tue, 2008-04-29 at 19:17 -0700, David Miller wrote:
> > The build number increments every time you make.
> > 
> > That's where the "#nn" in the uname output comes from.
> 
> Well, if nothing is changed, why it tries to recompile the image? IIRC,
> we don't have this problem in early kernels.

Something did change, the build number in the header file.

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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  2008-04-30  2:14     ` Zhu Yi
  2008-04-30  2:17       ` David Miller
@ 2008-04-30  2:36       ` Randy.Dunlap
  2008-04-30  9:34         ` Zhu Yi
  1 sibling, 1 reply; 18+ messages in thread
From: Randy.Dunlap @ 2008-04-30  2:36 UTC (permalink / raw)
  To: Zhu Yi; +Cc: John W. Linville, Jason Riedy, David S. Miller, netdev

On Wed, 30 Apr 2008, Zhu Yi wrote:

> On Tue, 2008-04-29 at 09:27 -0400, John W. Linville wrote:
> > 
> > > Do we have a way to make "select IWLWIFI" generate CONFIG_IWLWIFI
> > with
> > > the same state as CONFIG_IWLCORE (or CONFIG_IWL3945)? AFAICS,
> > > CONFIG_IWLWIFI is always 'y' whenever CONFIG_IWLCORE is 'y' or 'm'.
> > If
> > > the latter is 'm', the Makefile will generate a empty built-in.o
> > which
> > > requires vmlinux to update unnecessarily every time we only compile
> > > iwl3945/4965 modules.
> > 
> > Can you do something like  "default IWLCORE'?  Untested, off the top
> > of my head...
> 
> I just realized the kernel now updates vmlinux when I type 'make' even
> if nothing is changed in the source code. Is this a bug or feature?

I see files in arch/x86/kernel/acpi/realmode/ always being built.
Is that what you see or is it something else?

You can do
  make V=2 all >build.log 2>&1
to see what is being rebuilt and hopefully why.
Then post that and maybe we can fix it (with the right people helping).

-- 
~Randy

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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  2008-04-30  2:32           ` David Miller
@ 2008-04-30  4:46             ` Bill Fink
  0 siblings, 0 replies; 18+ messages in thread
From: Bill Fink @ 2008-04-30  4:46 UTC (permalink / raw)
  To: David Miller; +Cc: yi.zhu, linville, jason, netdev

On Tue, 29 Apr 2008, David Miller wrote:

> From: Zhu Yi <yi.zhu@intel.com>
> Date: Wed, 30 Apr 2008 10:31:07 +0800
> 
> > On Tue, 2008-04-29 at 19:17 -0700, David Miller wrote:
> > > The build number increments every time you make.
> > > 
> > > That's where the "#nn" in the uname output comes from.
> > 
> > Well, if nothing is changed, why it tries to recompile the image? IIRC,
> > we don't have this problem in early kernels.
> 
> Something did change, the build number in the header file.

It doesn't do it in 2.6.22:

[root@lang2 linux-2.6.22.9-foo]# pwd
/home/extra/usr/src/kernels/linux-2.6.22.9-foo

[root@lang2 linux-2.6.22.9-foo]# strings - vmlinux | grep 'Linux vers'
Linux version 2.6.22.9-mf1 (root@lang2.eiger.nasa.atd.net) (gcc version 4.1.1 20060525 (Red Hat 4.1.1-1)) #4 SMP Wed Apr 30 00:37:52 EDT 2008

[root@lang2 linux-2.6.22.9-foo]# make
  CHK     include/linux/version.h
  CHK     include/linux/utsrelease.h
  CALL    scripts/checksyscalls.sh
  CHK     include/linux/compile.h
  MODPOST vmlinux
Kernel: arch/x86_64/boot/bzImage is ready  (#4)
  Building modules, stage 2.
  MODPOST 1605 modules

[root@lang2 linux-2.6.22.9-foo]# strings - vmlinux | grep 'Linux vers'
Linux version 2.6.22.9-mf1 (root@lang2.eiger.nasa.atd.net) (gcc version 4.1.1 20060525 (Red Hat 4.1.1-1)) #4 SMP Wed Apr 30 00:37:52 EDT 2008

This is as it should be I would think.

						-Bill

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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  2008-04-30  2:36       ` Randy.Dunlap
@ 2008-04-30  9:34         ` Zhu Yi
  2008-05-02 15:07           ` Sam Ravnborg
  0 siblings, 1 reply; 18+ messages in thread
From: Zhu Yi @ 2008-04-30  9:34 UTC (permalink / raw)
  To: Randy.Dunlap, Sam Ravnborg
  Cc: John W. Linville, Jason Riedy, David S. Miller, netdev

On Tue, 2008-04-29 at 19:36 -0700, Randy.Dunlap wrote:
> On Wed, 30 Apr 2008, Zhu Yi wrote:
> 
> > On Tue, 2008-04-29 at 09:27 -0400, John W. Linville wrote:
> > > 
> > > > Do we have a way to make "select IWLWIFI" generate CONFIG_IWLWIFI
> > > with
> > > > the same state as CONFIG_IWLCORE (or CONFIG_IWL3945)? AFAICS,
> > > > CONFIG_IWLWIFI is always 'y' whenever CONFIG_IWLCORE is 'y' or 'm'.
> > > If
> > > > the latter is 'm', the Makefile will generate a empty built-in.o
> > > which
> > > > requires vmlinux to update unnecessarily every time we only compile
> > > > iwl3945/4965 modules.
> > > 
> > > Can you do something like  "default IWLCORE'?  Untested, off the top
> > > of my head...
> > 
> > I just realized the kernel now updates vmlinux when I type 'make' even
> > if nothing is changed in the source code. Is this a bug or feature?
> 
> I see files in arch/x86/kernel/acpi/realmode/ always being built.
> Is that what you see or is it something else?
> 
> You can do
>   make V=2 all >build.log 2>&1
> to see what is being rebuilt and hopefully why.
> Then post that and maybe we can fix it (with the right people helping).

I found below fixes the problem. Sam, could you take a look?

Thanks,
-yi


diff --git a/Makefile b/Makefile
index 39516bf..7788c77 100644
--- a/Makefile
+++ b/Makefile
@@ -812,7 +812,7 @@ endif
 
 # build vmlinux.o first to catch section mismatch errors early
 ifdef CONFIG_KALLSYMS
-.tmp_vmlinux1: vmlinux.o
+#.tmp_vmlinux1: vmlinux.o
 endif
 vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE
        $(call if_changed_rule,vmlinux-modpost)



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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  2008-04-30  9:34         ` Zhu Yi
@ 2008-05-02 15:07           ` Sam Ravnborg
  2008-05-04  1:50             ` Zhu Yi
  0 siblings, 1 reply; 18+ messages in thread
From: Sam Ravnborg @ 2008-05-02 15:07 UTC (permalink / raw)
  To: Zhu Yi; +Cc: Randy.Dunlap, John W. Linville, Jason Riedy, David S. Miller,
	netdev

On Wed, Apr 30, 2008 at 05:34:26PM +0800, Zhu Yi wrote:
> On Tue, 2008-04-29 at 19:36 -0700, Randy.Dunlap wrote:
> > On Wed, 30 Apr 2008, Zhu Yi wrote:
> > 
> > > On Tue, 2008-04-29 at 09:27 -0400, John W. Linville wrote:
> > > > 
> > > > > Do we have a way to make "select IWLWIFI" generate CONFIG_IWLWIFI
> > > > with
> > > > > the same state as CONFIG_IWLCORE (or CONFIG_IWL3945)? AFAICS,
> > > > > CONFIG_IWLWIFI is always 'y' whenever CONFIG_IWLCORE is 'y' or 'm'.
> > > > If
> > > > > the latter is 'm', the Makefile will generate a empty built-in.o
> > > > which
> > > > > requires vmlinux to update unnecessarily every time we only compile
> > > > > iwl3945/4965 modules.
> > > > 
> > > > Can you do something like  "default IWLCORE'?  Untested, off the top
> > > > of my head...
> > > 
> > > I just realized the kernel now updates vmlinux when I type 'make' even
> > > if nothing is changed in the source code. Is this a bug or feature?
> > 
> > I see files in arch/x86/kernel/acpi/realmode/ always being built.
> > Is that what you see or is it something else?
> > 
> > You can do
> >   make V=2 all >build.log 2>&1
> > to see what is being rebuilt and hopefully why.
> > Then post that and maybe we can fix it (with the right people helping).
> 
> I found below fixes the problem. Sam, could you take a look?

Fix is in -linus now.

	Sam

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

* Re: [PATCH] Allow building iwl3945 without iwl4965.
  2008-05-02 15:07           ` Sam Ravnborg
@ 2008-05-04  1:50             ` Zhu Yi
  0 siblings, 0 replies; 18+ messages in thread
From: Zhu Yi @ 2008-05-04  1:50 UTC (permalink / raw)
  To: Sam Ravnborg
  Cc: Randy.Dunlap, John W. Linville, Jason Riedy, David S. Miller,
	netdev

On Fri, 2008-05-02 at 17:07 +0200, Sam Ravnborg wrote:
> > > to see what is being rebuilt and hopefully why.
> > > Then post that and maybe we can fix it (with the right people
> helping).
> > 
> > I found below fixes the problem. Sam, could you take a look?
> 
> Fix is in -linus now.

Thanks!

-yi


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

* [2.6 patch] make IWLWIFI a tristate
  2008-04-29  2:19 ` Zhu Yi
  2008-04-29 13:27   ` John W. Linville
@ 2008-05-05 18:25   ` Adrian Bunk
  2008-05-05 19:40     ` David Miller
  2008-05-06  1:26     ` Zhu Yi
  1 sibling, 2 replies; 18+ messages in thread
From: Adrian Bunk @ 2008-05-05 18:25 UTC (permalink / raw)
  To: Zhu Yi; +Cc: Jason Riedy, David S. Miller, netdev

On Tue, Apr 29, 2008 at 10:19:57AM +0800, Zhu Yi wrote:
> On Sat, 2008-04-26 at 15:27 -0700, Jason Riedy wrote:
> > 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:
> 
> Do we have a way to make "select IWLWIFI" generate CONFIG_IWLWIFI with
> the same state as CONFIG_IWLCORE (or CONFIG_IWL3945)?
>...

Fix below.

> Thanks,
> -yi

cu
Adrian


<--  snip  -->


IWLWIFI should be a tristate so that if IWLCORE and/or IWL3945 are m
and none of them is y kbuild doesn't create an empty 
drivers/net/wireless/built-in.o

This patch also removes the pointless "default n".

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
f9737a109a127754ae7cc35e94d44fb426e0dea1 diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index d5b7a76..62fb89d 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,6 +1,5 @@
 config IWLWIFI
-	bool
-	default n
+	tristate
 
 config IWLCORE
 	tristate "Intel Wireless Wifi Core"


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

* Re: [2.6 patch] make IWLWIFI a tristate
  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
  1 sibling, 1 reply; 18+ messages in thread
From: David Miller @ 2008-05-05 19:40 UTC (permalink / raw)
  To: bunk; +Cc: yi.zhu, jason, netdev

From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 5 May 2008 21:25:16 +0300

> IWLWIFI should be a tristate so that if IWLCORE and/or IWL3945 are m
> and none of them is y kbuild doesn't create an empty 
> drivers/net/wireless/built-in.o
> 
> This patch also removes the pointless "default n".
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

I'll let this sit and cook for a while so that others can
review and test this patch.  We've had enough churn in this
area already :-)

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

* Re: [2.6 patch] make IWLWIFI a tristate
  2008-05-05 19:40     ` David Miller
@ 2008-05-05 19:42       ` Adrian Bunk
  0 siblings, 0 replies; 18+ messages in thread
From: Adrian Bunk @ 2008-05-05 19:42 UTC (permalink / raw)
  To: David Miller; +Cc: yi.zhu, jason, netdev

On Mon, May 05, 2008 at 12:40:20PM -0700, David Miller wrote:
> From: Adrian Bunk <bunk@kernel.org>
> Date: Mon, 5 May 2008 21:25:16 +0300
> 
> > IWLWIFI should be a tristate so that if IWLCORE and/or IWL3945 are m
> > and none of them is y kbuild doesn't create an empty 
> > drivers/net/wireless/built-in.o
> > 
> > This patch also removes the pointless "default n".
> > 
> > Signed-off-by: Adrian Bunk <bunk@kernel.org>
> 
> I'll let this sit and cook for a while so that others can
> review and test this patch.  We've had enough churn in this
> area already :-)

No need to hurry, what it fixes is purely cosmetic.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed


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

* Re: [2.6 patch] make IWLWIFI a tristate
  2008-05-05 18:25   ` [2.6 patch] make IWLWIFI a tristate Adrian Bunk
  2008-05-05 19:40     ` David Miller
@ 2008-05-06  1:26     ` Zhu Yi
  2008-05-06  7:05       ` David Miller
  1 sibling, 1 reply; 18+ messages in thread
From: Zhu Yi @ 2008-05-06  1:26 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Jason Riedy, David S. Miller, netdev

On Mon, 2008-05-05 at 21:25 +0300, Adrian Bunk wrote:
> 
> IWLWIFI should be a tristate so that if IWLCORE and/or IWL3945 are m
> and none of them is y kbuild doesn't create an empty 
> drivers/net/wireless/built-in.o
> 
> This patch also removes the pointless "default n".
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
> 
> ---
> f9737a109a127754ae7cc35e94d44fb426e0dea1 diff --git
> a/drivers/net/wireless/iwlwifi/Kconfig
> b/drivers/net/wireless/iwlwifi/Kconfig
> index d5b7a76..62fb89d 100644
> --- a/drivers/net/wireless/iwlwifi/Kconfig
> +++ b/drivers/net/wireless/iwlwifi/Kconfig
> @@ -1,6 +1,5 @@
>  config IWLWIFI
> -       bool
> -       default n
> +       tristate
>  
>  config IWLCORE
>         tristate "Intel Wireless Wifi Core"

Great. Thank you Adrian!

-yi


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

* Re: [2.6 patch] make IWLWIFI a tristate
  2008-05-06  1:26     ` Zhu Yi
@ 2008-05-06  7:05       ` David Miller
  0 siblings, 0 replies; 18+ messages in thread
From: David Miller @ 2008-05-06  7:05 UTC (permalink / raw)
  To: yi.zhu; +Cc: bunk, jason, netdev

From: Zhu Yi <yi.zhu@intel.com>
Date: Tue, 06 May 2008 09:26:18 +0800

> On Mon, 2008-05-05 at 21:25 +0300, Adrian Bunk wrote:
> > @@ -1,6 +1,5 @@
> >  config IWLWIFI
> > -       bool
> > -       default n
> > +       tristate
> >  
> >  config IWLCORE
> >         tristate "Intel Wireless Wifi Core"
> 
> Great. Thank you Adrian!

I've applied Adrian's patch, thanks everyone.

^ permalink raw reply	[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).