Subject: Re: [net-next] spider_net: fix compile issue introduced by driver move

From: Jeff Kirsher <[email-masked]>
Date: Thu, 11 Aug 2011 23:08:35 -0700

On Thu, 2011-08-11 at 23:00 -0700, David Miller wrote:
> From: Stephen Rothwell <[email-masked]>
> Date: Fri, 12 Aug 2011 15:00:03 +1000
> 
> > However, Dave, I now get these (powerpc ppc64defconfig build of just the
> > net tree):
> 
> This should fix the cxgbi scsi problems, I'll work on the mlx4 ones
> next.
> 
> Thanks.

Dang you beat me to it.  I have the inifiniband fix as well in my patch.

> 
> From b6a0e86efb79b8ee71cb2129f3ad384d7efc22e3 Mon Sep 17 00:00:00 2001
> From: "David S. Miller" <[email-masked]>
> Date: Thu, 11 Aug 2011 22:59:31 -0700
> Subject: [PATCH] cxgbi: Fix scsi Kconfig dependencies.
> 
> Reported-by: Stephen Rothwell <[email-masked]>
> Signed-off-by: David S. Miller <[email-masked]>
> ---
>  drivers/scsi/cxgbi/cxgb3i/Kconfig |    3 ++-
>  drivers/scsi/cxgbi/cxgb4i/Kconfig |    3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/cxgbi/cxgb3i/Kconfig b/drivers/scsi/cxgbi/cxgb3i/Kconfig
> index 11dff23..6bbc36f 100644
> --- a/drivers/scsi/cxgbi/cxgb3i/Kconfig
> +++ b/drivers/scsi/cxgbi/cxgb3i/Kconfig
> @@ -2,7 +2,8 @@ config SCSI_CXGB3_ISCSI
>  	tristate "Chelsio T3 iSCSI support"
>  	depends on PCI && INET
>  	select NETDEVICES
> -	select NETDEV_10000
> +	select ETHERNET
> +	select NET_VENDOR_CHELSIO
>  	select CHELSIO_T3
>  	select SCSI_ISCSI_ATTRS
>  	---help---
> diff --git a/drivers/scsi/cxgbi/cxgb4i/Kconfig b/drivers/scsi/cxgbi/cxgb4i/Kconfig
> index d5302c2..16b2c7d 100644
> --- a/drivers/scsi/cxgbi/cxgb4i/Kconfig
> +++ b/drivers/scsi/cxgbi/cxgb4i/Kconfig
> @@ -2,7 +2,8 @@ config SCSI_CXGB4_ISCSI
>  	tristate "Chelsio T4 iSCSI support"
>  	depends on PCI && INET
>  	select NETDEVICES
> -	select NETDEV_10000
> +	select ETHERNET
> +	select NET_VENDOR_CHELSIO
>  	select CHELSIO_T4
>  	select SCSI_ISCSI_ATTRS
>  	---help---