linux-2.3 mang

Michael Ang mang@puffin.external.hp.com
Tue, 8 Feb 2000 13:27:22 -0700


CVSROOT:	/home/cvs/parisc
Module name:	linux-2.3
Changes by:	mang	00/02/08 13:27:21

Modified files:
	drivers/net    : 3c503.c 3c509.c 3c527.c Config.in Makefile 
	                 Space.c a2065.c a2065.h ariadne.c ariadne.h 
	                 ariadne2.c arlan-proc.c arlan.c arlan.h cops.c 
	                 cops.h cops_ffdrv.h cops_ltdrv.h cs89x0.h 
	                 daynaport.c de4x5.c eepro.c eexpress.c eth16i.c 
	                 hp100.c hydra.c ipddp.c lance.c macsonic.c 
	                 myri_sbus.c myri_sbus.h pcnet32.c plip.c 
	                 ptifddi.c rclanmtl.c rrunner.c sb1000.c setup.c 
	                 shaper.c sis900.c sis900.h smc-ultra.c 
	                 sun3lance.c sunbmac.c sunbmac.h sunhme.c 
	                 sunhme.h sunlance.c sunqe.c sunqe.h tlan.c 
	                 tlan.h wavelan.c wavelan.p.h 
	drivers/net/irda: Config.in Makefile actisys.c esi.c girbil.c 
	                  irport.c irtty.c litelink.c smc-ircc.c 
	                  tekram.c toshoboe.c w83977af_ir.c 
	drivers/net/pcmcia: 3c574_cs.c 3c575_cb.c 3c589_cs.c Config.in 
	                    Makefile fmvj18x_cs.c netwave_cs.c 
	                    nmclan_cs.c pcnet_cs.c ray_cs.c 
	                    smc91c92_cs.c tulip_cb.c wavelan_cs.c 
	                    wavelan_cs.h xirc2ps_cs.c 
	drivers/net/sk98lin: skge.c 
	drivers/net/tokenring: Config.in Makefile ibmtr.c ibmtr.h 
	                       olympic.c olympic.h tms380tr.c tms380tr.h 
	drivers/net/wan: Config.in Makefile cosa.c cycx_drv.c 
	                 cycx_main.c cycx_x25.c hostess_sv11.c sdla.c 
	                 sdla_fr.c sdla_ppp.c sdladrv.c sdlamain.c 
	                 sealevel.c syncppp.c syncppp.h z85230.c 
	                 z85230.h 
Added files:
	drivers/net    : aironet4500.h aironet4500_card.c 
	                 aironet4500_core.c aironet4500_proc.c 
	                 aironet4500_rid.c mac89x0.c macmace.c oaknet.c 
	drivers/net/arcnet: Config.in Makefile arc-rawmode.c arc-rimi.c 
	                    arcnet.c com20020-isa.c com20020-pci.c 
	                    com20020.c com90io.c com90xx.c rfc1051.c 
	                    rfc1201.c 
	drivers/net/irda: nsc-ircc.c old_belkin.c 
	drivers/net/pcmcia: aironet4500_cs.c com20020_cs.c 
	drivers/net/tokenring: abyss.c abyss.h madgemc.c madgemc.h 
	                       smctr.c smctr.h smctr_firmware.h tmspci.c 
	drivers/net/wan: sdla_chdlc.c 

Log message:
Merge differences between linus2329 and linus2342.