diff options
author | gibbs <gibbs@FreeBSD.org> | 1997-04-14 00:35:25 +0000 |
---|---|---|
committer | gibbs <gibbs@FreeBSD.org> | 1997-04-14 00:35:25 +0000 |
commit | f1730f3a0ad9ba7560c9baf9e04abc106b4fcdcc (patch) | |
tree | 2417b71bfbf525e2df8b349726f8808bd2946da3 /sys | |
parent | 799987ea994bbe5a91745ed7593fbf77dd3087b3 (diff) | |
download | FreeBSD-src-f1730f3a0ad9ba7560c9baf9e04abc106b4fcdcc.zip FreeBSD-src-f1730f3a0ad9ba7560c9baf9e04abc106b4fcdcc.tar.gz |
GENERIC, LINT:
Add an ie entry that corresponds to the location the old ix entry used
to probe and kill the ix entry.
files.i386:
Remove entries for the ix driver.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/conf/GENERIC | 6 | ||||
-rw-r--r-- | sys/conf/NOTES | 6 | ||||
-rw-r--r-- | sys/conf/files.i386 | 3 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC | 6 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 6 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 6 | ||||
-rw-r--r-- | sys/i386/conf/files.i386 | 3 |
7 files changed, 17 insertions, 19 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 3263f42..291f7a1 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.88 1997/03/13 19:03:58 bde Exp $ +# $Id: GENERIC,v 1.89 1997/03/29 11:06:55 phk Exp $ machine "i386" cpu "I386_CPU" @@ -135,11 +135,11 @@ device vx0 device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr device ed1 at isa? port 0x300 net irq 5 iomem 0xd8000 vector edintr -device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr +device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr +device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr device ep0 at isa? port 0x300 net irq 10 vector epintr device ex0 at isa? port? net irq? vector exintr device fe0 at isa? port 0x300 net irq ? vector feintr -device ix0 at isa? port 0x300 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 5ce973b..a3cf90c 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.325 1997/03/29 11:06:58 phk Exp $ +# $Id: LINT,v 1.326 1997/04/07 01:26:34 bde 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 @@ -798,8 +798,8 @@ device el0 at isa? port 0x300 net irq 9 vector elintr device ep0 at isa? port 0x300 net irq 10 vector epintr device ex0 at isa? port? net irq? vector exintr device fe0 at isa? port 0x300 net irq ? vector feintr -device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr -device ix0 at isa? port 0x300 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr +device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector ieintr +device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr device lnc0 at isa? port 0x300 net irq 10 drq 0 vector lncintr device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector srintr diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 64970eb..e51cc4c0 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.157 1997/03/22 18:51:29 kato Exp $ +# $Id: files.i386,v 1.158 1997/04/03 05:57:16 gibbs Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/*.[chyl]" \ @@ -110,7 +110,6 @@ i386/isa/if_ep.c optional ep device-driver i386/isa/if_ex.c optional ex device-driver i386/isa/if_fe.c optional fe device-driver i386/isa/if_ie.c optional ie device-driver -i386/isa/if_ix.c optional ix device-driver i386/isa/if_le.c optional le device-driver i386/isa/if_lnc.c optional lnc device-driver i386/isa/if_sr.c optional sr device-driver diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 3263f42..291f7a1 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.88 1997/03/13 19:03:58 bde Exp $ +# $Id: GENERIC,v 1.89 1997/03/29 11:06:55 phk Exp $ machine "i386" cpu "I386_CPU" @@ -135,11 +135,11 @@ device vx0 device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr device ed1 at isa? port 0x300 net irq 5 iomem 0xd8000 vector edintr -device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr +device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr +device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr device ep0 at isa? port 0x300 net irq 10 vector epintr device ex0 at isa? port? net irq? vector exintr device fe0 at isa? port 0x300 net irq ? vector feintr -device ix0 at isa? port 0x300 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 5ce973b..a3cf90c 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.325 1997/03/29 11:06:58 phk Exp $ +# $Id: LINT,v 1.326 1997/04/07 01:26:34 bde 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 @@ -798,8 +798,8 @@ device el0 at isa? port 0x300 net irq 9 vector elintr device ep0 at isa? port 0x300 net irq 10 vector epintr device ex0 at isa? port? net irq? vector exintr device fe0 at isa? port 0x300 net irq ? vector feintr -device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr -device ix0 at isa? port 0x300 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr +device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector ieintr +device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr device lnc0 at isa? port 0x300 net irq 10 drq 0 vector lncintr device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector srintr diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 5ce973b..a3cf90c 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.325 1997/03/29 11:06:58 phk Exp $ +# $Id: LINT,v 1.326 1997/04/07 01:26:34 bde 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 @@ -798,8 +798,8 @@ device el0 at isa? port 0x300 net irq 9 vector elintr device ep0 at isa? port 0x300 net irq 10 vector epintr device ex0 at isa? port? net irq? vector exintr device fe0 at isa? port 0x300 net irq ? vector feintr -device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr -device ix0 at isa? port 0x300 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr +device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector ieintr +device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr device lnc0 at isa? port 0x300 net irq 10 drq 0 vector lncintr device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector srintr diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 64970eb..e51cc4c0 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.157 1997/03/22 18:51:29 kato Exp $ +# $Id: files.i386,v 1.158 1997/04/03 05:57:16 gibbs Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/*.[chyl]" \ @@ -110,7 +110,6 @@ i386/isa/if_ep.c optional ep device-driver i386/isa/if_ex.c optional ex device-driver i386/isa/if_fe.c optional fe device-driver i386/isa/if_ie.c optional ie device-driver -i386/isa/if_ix.c optional ix device-driver i386/isa/if_le.c optional le device-driver i386/isa/if_lnc.c optional lnc device-driver i386/isa/if_sr.c optional sr device-driver |