[LV-commit] CVS: kernel-2.5/drivers/net Makefile,1.24,1.25 aironet4500.h,1.1.1.4,NONE aironet4500_card.c,1.1.1.8,NONE aironet4500_core.c,1.1.1.6,NONE aironet4500_proc.c,1.1.1.9,NONE aironet4500_rid.c,1.1.1.2,NONE arlan-proc.c,1.1.1.2,NONE arlan.c,1.1.1.4,NONE arlan.h,1.1.1.2,NONE strip.c,1.1.1.4,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv15164/drivers/net

Modified Files:
	Makefile 
Removed Files:
	aironet4500.h aironet4500_card.c aironet4500_core.c 
	aironet4500_proc.c aironet4500_rid.c arlan-proc.c arlan.c 
	arlan.h strip.c 
Log Message:
Merge with 2.5.63


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile	5 Aug 2003 23:17:56 -0000	1.24
+++ Makefile	19 Aug 2003 20:41:13 -0000	1.25
@@ -59,11 +59,6 @@
 #
 
 obj-$(CONFIG_MII) += mii.o
-obj-$(CONFIG_AIRONET4500) 	+= aironet4500_core.o
-obj-$(CONFIG_AIRONET4500_CS) 	+= aironet4500_core.o
-obj-$(CONFIG_AIRONET4500_NONCS)  += aironet4500_card.o
-obj-$(CONFIG_AIRONET4500_PROC)	+= aironet4500_proc.o
-obj-$(CONFIG_AIRONET4500_CS)	+= aironet4500_proc.o
 
 obj-$(CONFIG_WINBOND_840) += mii.o
 obj-$(CONFIG_SUNDANCE) += sundance.o mii.o
@@ -111,7 +106,6 @@
   obj-$(CONFIG_SLIP) += slhc.o
 endif
 
-obj-$(CONFIG_STRIP) += strip.o
 obj-$(CONFIG_DUMMY) += dummy.o
 obj-$(CONFIG_BONDING) += bonding.o
 obj-$(CONFIG_DE600) += de600.o
@@ -136,7 +130,6 @@
 obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
 obj-$(CONFIG_8139CP) += 8139cp.o mii.o
 obj-$(CONFIG_8139TOO) += 8139too.o mii.o
-obj-$(CONFIG_ARLAN) += arlan.o arlan-proc.o
 obj-$(CONFIG_ZNET) += znet.o
 obj-$(CONFIG_LAN_SAA9730) += saa9730.o
 obj-$(CONFIG_DEPCA) += depca.o

--- aironet4500.h DELETED ---

--- aironet4500_card.c DELETED ---

--- aironet4500_core.c DELETED ---

--- aironet4500_proc.c DELETED ---

--- aironet4500_rid.c DELETED ---

--- arlan-proc.c DELETED ---

--- arlan.c DELETED ---

--- arlan.h DELETED ---

--- strip.c DELETED ---