Menu
▾
▴
[Linux-mips-commits] CVS: linux/drivers/net Config.in,1.4,1.5 ioc3-eth.c,1.2,1.3 saa9730.c,1.3,1.4
|
From: James S. <jsi...@us...> - 2001-08-22 18:18:18
|
Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv15361/drivers/net
Modified Files:
Config.in ioc3-eth.c saa9730.c
Log Message:
Synced to Ralph's tree
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/Config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Config.in 2001/08/10 03:04:58 1.4
--- Config.in 2001/08/22 18:18:14 1.5
***************
*** 16,20 ****
fi
! tristate 'General Instruments Surfboard 1000' CONFIG_NET_SB1000
#
--- 16,22 ----
fi
! if [ "$CONFIG_ISAPNP" = "y" -o "$CONFIG_ISAPNP" = "m" ]; then
! tristate 'General Instruments Surfboard 1000' CONFIG_NET_SB1000 $CONFIG_ISAPNP
! fi
#
***************
*** 27,36 ****
bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
! if [ "$CONFIG_ARM" = "y" ]; then
! if [ "$CONFIG_ARCH_ACORN" != "y" ]; then
! tristate ' AM79C961A support' CONFIG_ARM_AM79C961A
! else
! source drivers/acorn/net/Config.in
! fi
fi
if [ "$CONFIG_PPC" = "y" ]; then
--- 29,35 ----
bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
! dep_bool ' ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A $CONFIG_ARCH_EBSA110
! if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
! source drivers/acorn/net/Config.in
fi
if [ "$CONFIG_PPC" = "y" ]; then
***************
*** 68,71 ****
--- 67,78 ----
tristate ' National DP83902AV support' CONFIG_STNIC
fi
+ dep_tristate ' Sun LANCE support' CONFIG_SUNLANCE $CONFIG_SBUS
+ if [ "$CONFIG_SBUS" = "y" -o "$CONFIG_PCI" = "y" ]; then
+ tristate ' Sun Happy Meal 10/100baseT support' CONFIG_HAPPYMEAL
+ fi
+ dep_tristate ' Sun BigMAC 10/100baseT support (EXPERIMENTAL)' CONFIG_SUNBMAC $CONFIG_SBUS $CONFIG_EXPERIMENTAL
+ dep_tristate ' Sun QuadEthernet support' CONFIG_SUNQE $CONFIG_SBUS
+ dep_tristate ' Sun LANCE support' CONFIG_SUNLANCE $CONFIG_SBUS
+ dep_tristate ' Sun GEM support' CONFIG_SUNGEM $CONFIG_PCI
bool ' 3COM cards' CONFIG_NET_VENDOR_3COM
if [ "$CONFIG_NET_VENDOR_3COM" = "y" ]; then
***************
*** 89,110 ****
bool ' Western Digital/SMC cards' CONFIG_NET_VENDOR_SMC
if [ "$CONFIG_NET_VENDOR_SMC" = "y" ]; then
! tristate ' WD80*3 support' CONFIG_WD80x3
! if [ "$CONFIG_MCA" = "y" ]; then
! tristate ' SMC Ultra MCA support' CONFIG_ULTRAMCA
! fi
! tristate ' SMC Ultra support' CONFIG_ULTRA
dep_tristate ' SMC Ultra32 EISA support' CONFIG_ULTRA32 $CONFIG_EISA
! tristate ' SMC 9194 support' CONFIG_SMC9194
fi
bool ' Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL
if [ "$CONFIG_NET_VENDOR_RACAL" = "y" ]; then
! dep_tristate ' NI5010 support (EXPERIMENTAL)' CONFIG_NI5010 $CONFIG_EXPERIMENTAL
! tristate ' NI5210 support' CONFIG_NI52
! tristate ' NI6510 support' CONFIG_NI65
fi
! if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
! tristate ' AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700
fi
! tristate ' DEPCA, DE10x, DE200, DE201, DE202, DE422 support' CONFIG_DEPCA
if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_PCI" = "y" ]; then
tristate ' HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100
--- 96,117 ----
bool ' Western Digital/SMC cards' CONFIG_NET_VENDOR_SMC
if [ "$CONFIG_NET_VENDOR_SMC" = "y" ]; then
! dep_tristate ' WD80*3 support' CONFIG_WD80x3 $CONFIG_ISA
! dep_tristate ' SMC Ultra MCA support' CONFIG_ULTRAMCA $CONFIG_MCA
! dep_tristate ' SMC Ultra support' CONFIG_ULTRA $CONFIG_ISA
dep_tristate ' SMC Ultra32 EISA support' CONFIG_ULTRA32 $CONFIG_EISA
! dep_tristate ' SMC 9194 support' CONFIG_SMC9194 $CONFIG_ISA
fi
bool ' Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL
if [ "$CONFIG_NET_VENDOR_RACAL" = "y" ]; then
! dep_tristate ' NI5010 support (EXPERIMENTAL)' CONFIG_NI5010 $CONFIG_ISA $CONFIG_EXPERIMENTAL
! dep_tristate ' NI5210 support' CONFIG_NI52 $CONFIG_ISA
! dep_tristate ' NI6510 support' CONFIG_NI65 $CONFIG_ISA
fi
! if [ "$CONFIG_ISA" = "y" -o "$CONFIG_MCA" = "y" ]; then
! dep_tristate ' AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700 $CONFIG_EXPERIMENTAL
fi
! if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_MCA" = "y" ]; then
! tristate ' DEPCA, DE10x, DE200, DE201, DE202, DE422 support' CONFIG_DEPCA
! fi
if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_PCI" = "y" ]; then
tristate ' HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100
***************
*** 135,139 ****
tristate ' IBM LAN Adapter/A support' CONFIG_IBMLANA
fi
! bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
if [ "$CONFIG_NET_PCI" = "y" ]; then
dep_tristate ' AMD PCnet32 PCI support' CONFIG_PCNET32 $CONFIG_PCI
--- 142,150 ----
tristate ' IBM LAN Adapter/A support' CONFIG_IBMLANA
fi
! if [ "$CONFIG_ISA" = "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
***************
*** 143,149 ****
fi
! tristate ' Apricot Xen-II on board Ethernet' CONFIG_APRICOT
dep_tristate ' CS89x0 support' CONFIG_CS89x0 $CONFIG_ISA
dep_tristate ' DECchip Tulip (dc21x4x) PCI support' CONFIG_TULIP $CONFIG_PCI
if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
tristate ' Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
--- 154,162 ----
fi
! dep_tristate ' Apricot Xen-II on board Ethernet' CONFIG_APRICOT $CONFIG_ISA
dep_tristate ' CS89x0 support' CONFIG_CS89x0 $CONFIG_ISA
dep_tristate ' DECchip Tulip (dc21x4x) PCI support' CONFIG_TULIP $CONFIG_PCI
+ dep_mbool ' New bus configuration (EXPERIMENTAL)' CONFIG_TULIP_MWI $CONFIG_EXPERIMENTAL $CONFIG_TULIP
+ dep_mbool ' Use PCI shared mem for NIC registers' CONFIG_TULIP_MMIO $CONFIG_TULIP
if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
tristate ' Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
***************
*** 152,156 ****
dep_tristate ' Davicom DM910x/DM980x support' CONFIG_DM9102 $CONFIG_PCI
dep_tristate ' EtherExpressPro/100 support' CONFIG_EEPRO100 $CONFIG_PCI
- dep_mbool ' Enable Power Management (EXPERIMENTAL)' CONFIG_EEPRO100_PM $CONFIG_EEPRO100 $CONFIG_EXPERIMENTAL
dep_tristate ' Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390 $CONFIG_EISA $CONFIG_EXPERIMENTAL
dep_tristate ' Myson MTD-8xx PCI Ethernet support' CONFIG_FEALNX $CONFIG_PCI
--- 165,168 ----
***************
*** 171,179 ****
dep_tristate ' VIA Rhine support' CONFIG_VIA_RHINE $CONFIG_PCI
dep_tristate ' Winbond W89c840 Ethernet support' CONFIG_WINBOND_840 $CONFIG_PCI
- dep_tristate ' Sun Happy Meal 10/100baseT PCI support' CONFIG_HAPPYMEAL $CONFIG_PCI
if [ "$CONFIG_OBSOLETE" = "y" ]; then
! bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET
fi
! if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool ' Philips SAA9730 Ethernet support (EXPERIMENTAL)' CONFIG_LAN_SAA9730
fi
--- 183,190 ----
dep_tristate ' VIA Rhine support' CONFIG_VIA_RHINE $CONFIG_PCI
dep_tristate ' Winbond W89c840 Ethernet support' CONFIG_WINBOND_840 $CONFIG_PCI
if [ "$CONFIG_OBSOLETE" = "y" ]; then
! dep_bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET $CONFIG_ISA
fi
! if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_ORION" = "y" ]; then
bool ' Philips SAA9730 Ethernet support (EXPERIMENTAL)' CONFIG_LAN_SAA9730
fi
***************
*** 181,187 ****
bool ' Pocket and portable adapters' CONFIG_NET_POCKET
if [ "$CONFIG_NET_POCKET" = "y" ]; then
! dep_tristate ' AT-LAN-TEC/RealTek pocket adapter support' CONFIG_ATP $CONFIG_ISA
! tristate ' D-Link DE600 pocket adapter support' CONFIG_DE600
! tristate ' D-Link DE620 pocket adapter support' CONFIG_DE620
fi
if [ "$CONFIG_SGI_IP22" = "y" ]; then
--- 192,200 ----
bool ' Pocket and portable adapters' CONFIG_NET_POCKET
if [ "$CONFIG_NET_POCKET" = "y" ]; then
! if [ "$CONFIG_ISA" = "y" -a "$CONFIG_X86" = "y" ]; then
! tristate ' AT-LAN-TEC/RealTek pocket adapter support' CONFIG_ATP
! fi
! dep_tristate ' D-Link DE600 pocket adapter support' CONFIG_DE600 $CONFIG_ISA
! dep_tristate ' D-Link DE620 pocket adapter support' CONFIG_DE620 $CONFIG_ISA
fi
if [ "$CONFIG_SGI_IP22" = "y" ]; then
***************
*** 190,194 ****
if [ "$CONFIG_DECSTATION" = "y" ]; then
bool ' DEC LANCE ethernet controller support' CONFIG_DECLANCE
! fi
if [ "$CONFIG_BAGET_MIPS" = "y" ]; then
tristate ' Baget AMD LANCE support' CONFIG_BAGETLANCE
--- 203,207 ----
if [ "$CONFIG_DECSTATION" = "y" ]; then
bool ' DEC LANCE ethernet controller support' CONFIG_DECLANCE
! fi
if [ "$CONFIG_BAGET_MIPS" = "y" ]; then
tristate ' Baget AMD LANCE support' CONFIG_BAGETLANCE
***************
*** 206,216 ****
dep_tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC $CONFIG_PCI
! if [ "$CONFIG_ACENIC" != "n" ]; then
! bool ' Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
! fi
dep_tristate 'Packet Engines Hamachi GNIC-II support' CONFIG_HAMACHI $CONFIG_PCI
! if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
! dep_tristate 'Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN $CONFIG_PCI
! fi
dep_tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN $CONFIG_PCI
--- 219,226 ----
dep_tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC $CONFIG_PCI
! dep_mbool ' Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I $CONFIG_ACENIC
! dep_tristate 'MyriCOM Gigabit Ethernet support' CONFIG_MYRI_SBUS $CONFIG_SBUS
dep_tristate 'Packet Engines Hamachi GNIC-II support' CONFIG_HAMACHI $CONFIG_PCI
! dep_tristate 'Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN $CONFIG_PCI $CONFIG_EXPERIMENTAL
dep_tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN $CONFIG_PCI
***************
*** 222,226 ****
tristate ' Digital DEFEA and DEFPA adapter support' CONFIG_DEFXX
fi
! tristate ' SysKonnect FDDI PCI support' CONFIG_SKFP
fi
--- 232,236 ----
tristate ' Digital DEFEA and DEFPA adapter support' CONFIG_DEFXX
fi
! dep_tristate ' SysKonnect FDDI PCI support' CONFIG_SKFP $CONFIG_PCI
fi
***************
*** 229,233 ****
bool 'HIPPI driver support (EXPERIMENTAL)' CONFIG_HIPPI
if [ "$CONFIG_HIPPI" = "y" -a "$CONFIG_PCI" = "y" ]; then
! tristate ' Essential RoadRunner HIPPI PCI adapter support' CONFIG_ROADRUNNER
if [ "$CONFIG_ROADRUNNER" != "n" ]; then
bool ' Use large TX/RX rings' CONFIG_ROADRUNNER_LARGE_RINGS
--- 239,243 ----
bool 'HIPPI driver support (EXPERIMENTAL)' CONFIG_HIPPI
if [ "$CONFIG_HIPPI" = "y" -a "$CONFIG_PCI" = "y" ]; then
! dep_tristate ' Essential RoadRunner HIPPI PCI adapter support' CONFIG_ROADRUNNER $CONFIG_PCI
if [ "$CONFIG_ROADRUNNER" != "n" ]; then
bool ' Use large TX/RX rings' CONFIG_ROADRUNNER_LARGE_RINGS
***************
*** 237,243 ****
fi
! if [ ! "$CONFIG_PARPORT" = "n" ]; then
! dep_tristate 'PLIP (parallel port) support' CONFIG_PLIP $CONFIG_PARPORT
! fi
tristate 'PPP (point-to-point protocol) support' CONFIG_PPP
--- 247,251 ----
fi
! dep_tristate 'PLIP (parallel port) support' CONFIG_PLIP $CONFIG_PARPORT
tristate 'PPP (point-to-point protocol) support' CONFIG_PPP
***************
*** 249,255 ****
dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP
! if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
! dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
! fi
fi
--- 257,261 ----
dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP
! dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP $CONFIG_EXPERIMENTAL
fi
Index: ioc3-eth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/ioc3-eth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ioc3-eth.c 2001/07/09 19:28:47 1.2
--- ioc3-eth.c 2001/08/22 18:18:14 1.3
***************
*** 67,82 ****
#define RX_BUFFS 64
- /*
- * Private ioctls that de facto are well known and used for example
- * by mii-tool. These are deprecated and will go away in 2.5.0.
- */
- #define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */
- #define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */
- #define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */
-
- /* These exist in other drivers; we don't use them at this time. */
- #define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */
- #define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */
-
/* Timer state engine. */
enum ioc3_timer_state {
--- 67,70 ----
Index: saa9730.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/saa9730.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** saa9730.c 2001/08/10 03:04:58 1.3
--- saa9730.c 2001/08/22 18:18:14 1.4
***************
*** 45,49 ****
/* Non-zero only if the current card is a PCI with BIOS-set IRQ. */
! static unsigned int pci_irq_line = 0;
#define INL(a) inl((unsigned long)a)
--- 45,49 ----
/* Non-zero only if the current card is a PCI with BIOS-set IRQ. */
! static unsigned int pci_irq_line;
#define INL(a) inl((unsigned long)a)
|
