Patchwork net: CNIC depends on PCI.

login
register
mail settings
Submitter Paul Mundt
Date June 15, 2009, 6:12 p.m.
Message ID <20090615181244.GC30693@linux-sh.org>
Download mbox | patch
Permalink /patch/28708/
State Superseded
Delegated to: David Miller
Headers show

Comments

Paul Mundt - June 15, 2009, 6:12 p.m.
Even though this driver does shifty things with UIO to make it less
obvious, it is still PCI dependent:

drivers/net/cnic.c:2395: error: implicit declaration of function 'pci_dev_get'
make[3]: *** [drivers/net/cnic.o] Error 1
make[2]: *** [drivers/net] Error 2

This fixes up the CONFIG_PCI=n case, primarily triggered on
allmodconfig/allyesconfig builds:

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Cc: Michael Chan <mchan@broadcom.com>

---

 drivers/net/Kconfig |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Michael Chan - June 15, 2009, 6:24 p.m.
On Mon, 2009-06-15 at 11:12 -0700, Paul Mundt wrote:
> Even though this driver does shifty things with UIO to make it less
> obvious, it is still PCI dependent:
> 
> drivers/net/cnic.c:2395: error: implicit declaration of function 'pci_dev_get'
> make[3]: *** [drivers/net/cnic.o] Error 1
> make[2]: *** [drivers/net] Error 2
> 
> This fixes up the CONFIG_PCI=n case, primarily triggered on
> allmodconfig/allyesconfig builds:
> 
> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
> Cc: Michael Chan <mchan@broadcom.com>

A similar patch is already in James' tree:

http://git.kernel.org/?p=linux/kernel/git/jejb/scsi-misc-2.6.git;a=commit;h=babdb788f7ec1a782a52240a5f6dae568f32565f

> 
> ---
> 
>  drivers/net/Kconfig |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 3b63831..f6d6888 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -2272,8 +2272,7 @@ config BNX2
>  
>  config CNIC
>  	tristate "Broadcom CNIC support"
> -	depends on BNX2
> -	depends on UIO
> +	depends on PCI && BNX2 && UIO
>  	help
>  	  This driver supports offload features of Broadcom NetXtremeII
>  	  gigabit Ethernet cards.
> 


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3b63831..f6d6888 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2272,8 +2272,7 @@  config BNX2
 
 config CNIC
 	tristate "Broadcom CNIC support"
-	depends on BNX2
-	depends on UIO
+	depends on PCI && BNX2 && UIO
 	help
 	  This driver supports offload features of Broadcom NetXtremeII
 	  gigabit Ethernet cards.