Re: [PATCH] 2.4.6-pre6 fix drivers/net/Config.in error

From: Keith Owens (kaos@ocs.com.au)
Date: Thu Jun 28 2001 - 01:14:12 EST


On Thu, 28 Jun 2001 00:07:13 -0400,
Jeff Garzik <jgarzik@mandrakesoft.com> wrote:
>Steven Cole wrote:
>> - dep_bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
>> + dep_bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI $CONFIG_PCI
>
>See the "EISA" and "VLB" parts in there? EISA != PCI

Against 2.4.6-pre6.

Index: 6-pre6.1/drivers/net/Config.in
--- 6-pre6.1/drivers/net/Config.in Thu, 28 Jun 2001 10:34:32 +1000 kaos (linux-2.4/l/c/9_Config.in 1.1.2.2.1.3.1.8 644)
+++ 6-pre6.1(w)/drivers/net/Config.in Thu, 28 Jun 2001 16:07:03 +1000 kaos (linux-2.4/l/c/9_Config.in 1.1.2.2.1.3.1.8 644)
@@ -142,7 +142,11 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
       tristate ' NE/2 (ne2000 MCA version) support' CONFIG_NE2_MCA
       tristate ' IBM LAN Adapter/A support' CONFIG_IBMLANA
    fi
- dep_bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
+ if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_PCI" = "y" ]; then
+ bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
+ else
+ define_bool CONFIG_NET_PCI n
+ fi
    if [ "$CONFIG_NET_PCI" = "y" ]; then
       dep_tristate ' AMD PCnet32 PCI support' CONFIG_PCNET32 $CONFIG_PCI
       dep_tristate ' Adaptec Starfire support (EXPERIMENTAL)' CONFIG_ADAPTEC_STARFIRE $CONFIG_PCI $CONFIG_EXPERIMENTAL

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jun 30 2001 - 21:00:18 EST