*** ./config.in	Tue Jan 18 16:40:28 1994
--- ../stdlinux/./config.in	Mon Nov 29 08:09:00 1993
***************
*** 5,11 ****
  *
  * General setup
  *
! bool 'Kernel math emulation' CONFIG_MATH_EMULATION n
  bool 'Normal harddisk support' CONFIG_BLK_DEV_HD y
  bool 'XT harddisk support' CONFIG_BLK_DEV_XD n
  bool 'TCP/IP networking' CONFIG_INET y
--- 5,11 ----
  *
  * General setup
  *
! bool 'Kernel math emulation' CONFIG_MATH_EMULATION y
  bool 'Normal harddisk support' CONFIG_BLK_DEV_HD y
  bool 'XT harddisk support' CONFIG_BLK_DEV_XD n
  bool 'TCP/IP networking' CONFIG_INET y
***************
*** 55,69 ****
  : Skipping ethercard configuration options...
  :
  else
! bool 'SLIP (serial line) support' CONFIG_SLIP y
  if [ "$CONFIG_SLIP" = "y" ]
! bool ' CSLIP compressed headers' SL_COMPRESSED y
! bool ' SLIP debugging on' SL_DUMP y
  fi
  #bool 'PPP (point-to-point) support' CONFIG_PPP n
  bool 'PLIP (parallel port) support' CONFIG_PLIP n
  bool 'NE2000/NE1000 support' CONFIG_NE2000 n
! bool 'WD80*3 support' CONFIG_WD80x3 n
  bool 'SMC Ultra support' CONFIG_ULTRA n
  bool '3c501 support' CONFIG_EL1 n
  bool '3c503 support' CONFIG_EL2 n
--- 55,69 ----
  : Skipping ethercard configuration options...
  :
  else
! bool 'SLIP (serial line) support' CONFIG_SLIP n
  if [ "$CONFIG_SLIP" = "y" ]
!   bool ' CSLIP compressed headers' SL_COMPRESSED y
!   bool ' SLIP debugging on' SL_DUMP y
  fi
  #bool 'PPP (point-to-point) support' CONFIG_PPP n
  bool 'PLIP (parallel port) support' CONFIG_PLIP n
  bool 'NE2000/NE1000 support' CONFIG_NE2000 n
! bool 'WD80*3 support' CONFIG_WD80x3 y
  bool 'SMC Ultra support' CONFIG_ULTRA n
  bool '3c501 support' CONFIG_EL1 n
  bool '3c503 support' CONFIG_EL2 n
***************
*** 81,91 ****
  #bool 'Ansel Communications EISA 3200 support' CONFIG_AC3200 n
  #bool 'Cabletron E21xx support (not recommended)' CONFIG_E21 n
  bool 'D-Link DE600 pocket adaptor support' CONFIG_DE600 n
- bool 'D-Link DE650 PCMCIA adaptor support' CONFIG_DE650 y
- if [ "$CONFIG_DE650" = "y" ]
- bool 'Intel 82365 PCMCIA support' CONFIG_82365 y
- bool 'Databook TCIC/2 PCMCIA support' CONFIG_TCIC2 n
- fi
  #bool 'AT-LAN-TEC/RealTek pocket adaptor support' CONFIG_ATP n
  fi
  *
--- 81,86 ----
***************
*** 94,100 ****
  *
  * Filesystems
  *
! bool 'Standard (minix) fs support' CONFIG_MINIX_FS n
  bool 'Extended fs support' CONFIG_EXT_FS n
  bool 'Second extended fs support' CONFIG_EXT2_FS y
  bool 'xiafs filesystem support' CONFIG_XIA_FS n
--- 89,95 ----
  *
  * Filesystems
  *
! bool 'Standard (minix) fs support' CONFIG_MINIX_FS y
  bool 'Extended fs support' CONFIG_EXT_FS n
  bool 'Second extended fs support' CONFIG_EXT2_FS y
  bool 'xiafs filesystem support' CONFIG_XIA_FS n
***************
*** 107,118 ****
  *  character devices
  *
  bool 'Keyboard meta-key sends ESC-prefix' CONFIG_KBD_META y
! bool 'Keyboard Num Lock on by default' CONFIG_KBD_NUML n
  bool 'Parallel printer support' CONFIG_PRINTER y
  bool 'Logitech busmouse support' CONFIG_BUSMOUSE n
  bool 'PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE y
  if [ "$CONFIG_PSMOUSE" = "y" ]
! bool 'C&T 82C710 mouse port support (as on TI Travelmate)' CONFIG_82C710_MOUSE n
  fi
  bool 'Microsoft busmouse support' CONFIG_MS_BUSMOUSE n
  bool 'ATIXL busmouse support' CONFIG_ATIXL_BUSMOUSE n
--- 102,113 ----
  *  character devices
  *
  bool 'Keyboard meta-key sends ESC-prefix' CONFIG_KBD_META y
! bool 'Keyboard Num Lock on by default' CONFIG_KBD_NUML y
  bool 'Parallel printer support' CONFIG_PRINTER y
  bool 'Logitech busmouse support' CONFIG_BUSMOUSE n
  bool 'PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE y
  if [ "$CONFIG_PSMOUSE" = "y" ]
! bool 'C&T 82C710 mouse port support (as on TI Travelmate)' CONFIG_82C710_MOUSE y
  fi
  bool 'Microsoft busmouse support' CONFIG_MS_BUSMOUSE n
  bool 'ATIXL busmouse support' CONFIG_ATIXL_BUSMOUSE n
*** ./drivers/net/Space.c	Mon Jan 17 17:24:54 1994
--- ../stdlinux/./drivers/net/Space.c	Thu Nov 25 14:59:12 1993
***************
*** 53,59 ****
  extern int elplus_probe(struct device *);
  extern int ac3200_probe(struct device *);
  extern int e2100_probe(struct device *);
- extern int de650_probe(struct device *);
  
  /* Detachable devices ("pocket adaptors" and special PCMCIA drivers). */
  extern int atp_init(struct device *);
--- 53,58 ----
***************
*** 68,76 ****
  	return 1;		/* ENXIO */
  
      if (1
- #ifdef CONFIG_DE650
- 	&& de650_probe(dev)
- #endif
  #if defined(CONFIG_ULTRA)
  	&& ultra_probe(dev)
  #endif
--- 67,72 ----
*** ./drivers/net/Makefile	Mon Jan 17 17:49:01 1994
--- ../stdlinux/./drivers/net/Makefile	Fri Nov 26 14:11:51 1993
***************
*** 79,103 ****
  	$(CC) $(CPPFLAGS) $(CFLAGS) $(DL_OPTS) -c $<
  endif
  
- ifdef CONFIG_DE650
- NETDRV_OBJS := $(NETDRV_OBJS) net.a(de650.o)
- CONFIG_8390 = CONFIG_8390
- de650.o: de650.c CONFIG
- 	$(CC) $(CPPFLAGS) $(CFLAGS) $(DL_OPTS) -c $<
- endif
- 
- ifdef CONFIG_82365
- NETDRV_OBJS := $(NETDRV_OBJS) net.a(82365.o)
- 82365.o: 82365.c CONFIG
- 	$(CC) $(CPPFLAGS) $(CFLAGS) $(DL_OPTS) -c $<
- endif
- 
- ifdef CONFIG_TCIC2
- NETDRV_OBJS := $(NETDRV_OBJS) net.a(tcic2.o)
- tcic2.o: tcic2.c CONFIG
- 	$(CC) $(CPPFLAGS) $(CFLAGS) $(DL_OPTS) -c $<
- endif
- 
  ifdef CONFIG_AT1500
  NETDRV_OBJS := $(NETDRV_OBJS) net.a(lance.o)
  endif
--- 79,84 ----
*** ../stdlinux/drivers/net/CONFIG	Mon Oct 11 18:32:16 1993
--- drivers/net/CONFIG	Tue Jan 18 00:48:42 1994
***************
*** 35,42 ****
--- 35,45 ----
  #	  D_LINK_IRQ	The D-Link IRQ number to use (IRQ7 == default)
  #	  D_LINK_DEBUG	Enable or disable D-Link debugging
  #
+ #  DL650		The D-Link DE-650 PCMCIA Ethernet card
+ #	DE_SHMEM=xxx	Forces the address of shared memory
  
  OPTS		= #-DEI8390=0 -DEI8390_IRQ=0
+ OPTS		= -DEI8390=0x300 -DEI8390_IRQ=5
  WD_OPTS		= #-DWD_SHMEM=0
  EL2_OPTS	= #-UEL2_AUI
  NE_OPTS		=
***************
*** 45,47 ****
--- 48,51 ----
  SLIP_OPTS	= -DSL_DUMP -DSL_COMPRESSED
  DL_OPTS		= -DD_LINK_IO=0x378 -DD_LINK_IRQ=7 -UD_LINK_DEBUG
  AT_OPTS		= # -DLANCE_DMA=5
+ DE650_OPTS	= -DDE_SHMEM=0xD6000 -DEI_DEBUG=2