diff options
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/conf/NOTES | 4 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 3 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 4 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 4 | ||||
| -rw-r--r-- | sys/i386/conf/files.i386 | 3 |
7 files changed, 17 insertions, 7 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 28eec1c2dd40..6e35515b5a9a 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.168 1999/05/04 00:15:15 msmith Exp $ +# $Id: GENERIC,v 1.169 1999/05/09 16:45:52 phk Exp $ machine i386 cpu I386_CPU @@ -176,6 +176,7 @@ device ex0 at isa? port? irq? device fe0 at isa? port 0x300 irq ? device le0 at isa? port 0x300 irq 5 iomem 0xd0000 device lnc0 at isa? port 0x280 irq 10 drq 0 +#device xe0 at isa? port? irq ? #device ze0 at isa? port 0x300 irq 10 iomem 0xd8000 #device zp0 at isa? port 0x300 irq 10 iomem 0xd8000 device cs0 at isa? port 0x300 irq ? diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 978f2f731fd4..eb8953ebc511 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.596 1999/05/09 22:26:10 peter Exp $ +# $Id: LINT,v 1.597 1999/05/11 10:10:39 jb Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1199,6 +1199,7 @@ options EXTRA_SIO=2 #number of extra sio ports to allocate # wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both # the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA # bridge with a PCMCIA adapter plugged into it. +# xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller. # ze: IBM/National Semiconductor PCMCIA ethernet controller. # zp: 3Com PCMCIA Etherlink III (It does not require shared memory for # send/receive operation, but it needs 'iomem' to read/write the @@ -1224,6 +1225,7 @@ device wi0 at isa? port? irq? options WLCACHE # enables the signal-strength cache options WLDEBUG # enables verbose debugging output device wl0 at isa? port 0x300 irq ? +device xe0 at isa? port? irq ? # We can (bogusly) include both the dedicated PCCARD drivers and the generic # support when COMPILING_LINT. device ze0 at isa? port 0x300 irq 5 iomem 0xd8000 diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 5261411b1390..ccaafad21903 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.238 1999/05/08 15:46:46 peter Exp $ +# $Id: files.i386,v 1.239 1999/05/09 16:46:01 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -156,6 +156,7 @@ i386/isa/if_rdp.c optional rdp device-driver i386/isa/if_sr.c optional sr device-driver i386/isa/if_wi.c optional wi device-driver i386/isa/if_wl.c optional wl device-driver +dev/pccard/if_xe.c optional xe device-driver i386/isa/if_ze.c optional ze device-driver i386/isa/if_zp.c optional zp device-driver contrib/dev/oltr/if_oltr.c optional oltr device-driver diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 28eec1c2dd40..6e35515b5a9a 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.168 1999/05/04 00:15:15 msmith Exp $ +# $Id: GENERIC,v 1.169 1999/05/09 16:45:52 phk Exp $ machine i386 cpu I386_CPU @@ -176,6 +176,7 @@ device ex0 at isa? port? irq? device fe0 at isa? port 0x300 irq ? device le0 at isa? port 0x300 irq 5 iomem 0xd0000 device lnc0 at isa? port 0x280 irq 10 drq 0 +#device xe0 at isa? port? irq ? #device ze0 at isa? port 0x300 irq 10 iomem 0xd8000 #device zp0 at isa? port 0x300 irq 10 iomem 0xd8000 device cs0 at isa? port 0x300 irq ? diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 978f2f731fd4..eb8953ebc511 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.596 1999/05/09 22:26:10 peter Exp $ +# $Id: LINT,v 1.597 1999/05/11 10:10:39 jb Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1199,6 +1199,7 @@ options EXTRA_SIO=2 #number of extra sio ports to allocate # wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both # the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA # bridge with a PCMCIA adapter plugged into it. +# xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller. # ze: IBM/National Semiconductor PCMCIA ethernet controller. # zp: 3Com PCMCIA Etherlink III (It does not require shared memory for # send/receive operation, but it needs 'iomem' to read/write the @@ -1224,6 +1225,7 @@ device wi0 at isa? port? irq? options WLCACHE # enables the signal-strength cache options WLDEBUG # enables verbose debugging output device wl0 at isa? port 0x300 irq ? +device xe0 at isa? port? irq ? # We can (bogusly) include both the dedicated PCCARD drivers and the generic # support when COMPILING_LINT. device ze0 at isa? port 0x300 irq 5 iomem 0xd8000 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 978f2f731fd4..eb8953ebc511 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.596 1999/05/09 22:26:10 peter Exp $ +# $Id: LINT,v 1.597 1999/05/11 10:10:39 jb Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1199,6 +1199,7 @@ options EXTRA_SIO=2 #number of extra sio ports to allocate # wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both # the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA # bridge with a PCMCIA adapter plugged into it. +# xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller. # ze: IBM/National Semiconductor PCMCIA ethernet controller. # zp: 3Com PCMCIA Etherlink III (It does not require shared memory for # send/receive operation, but it needs 'iomem' to read/write the @@ -1224,6 +1225,7 @@ device wi0 at isa? port? irq? options WLCACHE # enables the signal-strength cache options WLDEBUG # enables verbose debugging output device wl0 at isa? port 0x300 irq ? +device xe0 at isa? port? irq ? # We can (bogusly) include both the dedicated PCCARD drivers and the generic # support when COMPILING_LINT. device ze0 at isa? port 0x300 irq 5 iomem 0xd8000 diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 5261411b1390..ccaafad21903 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.238 1999/05/08 15:46:46 peter Exp $ +# $Id: files.i386,v 1.239 1999/05/09 16:46:01 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -156,6 +156,7 @@ i386/isa/if_rdp.c optional rdp device-driver i386/isa/if_sr.c optional sr device-driver i386/isa/if_wi.c optional wi device-driver i386/isa/if_wl.c optional wl device-driver +dev/pccard/if_xe.c optional xe device-driver i386/isa/if_ze.c optional ze device-driver i386/isa/if_zp.c optional zp device-driver contrib/dev/oltr/if_oltr.c optional oltr device-driver |