7 files changed, 7 insertions, 15 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 721b5701ec14..ee6713ea421c 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -174,9 +174,7 @@ device		xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.
 device		ed0	at isa? port 0x280 irq 10 iomem 0xd8000
-device		ex0	at isa? port? irq?
-# NOTE: This removes the isa attachment so that the pccard unit numbers
-# come out right.
+device		ex0
 device		ep0
 # WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
 # exists only as a PCMCIA device, so there is no ISA attatement needed
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 432483bef78a..a651ccb37634 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1271,7 +1271,7 @@ device cx0 at isa? port 0x240 irq 15 drq 7
 device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
 device el0 at isa? port 0x300 irq 9
 device ep0
-device ex0 at isa? port? irq?
+device ex0
 device fe0 at isa? port 0x300 irq ?
 device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
 device ie1 at isa? port 0x360 irq 7 iomem 0xd0000
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 721b5701ec14..ee6713ea421c 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -174,9 +174,7 @@ device		xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.
 device		ed0	at isa? port 0x280 irq 10 iomem 0xd8000
-device		ex0	at isa? port? irq?
-# NOTE: This removes the isa attachment so that the pccard unit numbers
-# come out right.
+device		ex0
 device		ep0
 # WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
 # exists only as a PCMCIA device, so there is no ISA attatement needed
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 432483bef78a..a651ccb37634 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -1271,7 +1271,7 @@ device cx0 at isa? port 0x240 irq 15 drq 7
 device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
 device el0 at isa? port 0x300 irq 9
 device ep0
-device ex0 at isa? port? irq?
+device ex0
 device fe0 at isa? port 0x300 irq ?
 device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
 device ie1 at isa? port 0x360 irq 7 iomem 0xd0000
diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD
index e2d07638a4c2..557874da5f20 100644
--- a/sys/i386/conf/NEWCARD
+++ b/sys/i386/conf/NEWCARD
@@ -182,9 +182,7 @@ device		xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.
 device		ed0	at isa? port 0x280 irq 10 iomem 0xd8000
-device		ex0	at isa? port? irq?
-# NOTE: This removes the isa attachment so that the pccard unit numbers
-# come out right.
+device		ex0
 device		ep0
 # WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
 # exists only as a PCMCIA device, so there is no ISA attatement needed
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 432483bef78a..a651ccb37634 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1271,7 +1271,7 @@ device cx0 at isa? port 0x240 irq 15 drq 7
 device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
 device el0 at isa? port 0x300 irq 9
 device ep0
-device ex0 at isa? port? irq?
+device ex0
 device fe0 at isa? port 0x300 irq ?
 device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
 device ie1 at isa? port 0x360 irq 7 iomem 0xd0000
diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD
index 35e611639612..8cdfe3762c35 100644
--- a/sys/i386/conf/PCCARD
+++ b/sys/i386/conf/PCCARD
@@ -174,9 +174,7 @@ device		xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.
 device		ed0	at isa? port 0x280 irq 10 iomem 0xd8000
-device		ex0	at isa? port? irq?
-# NOTE: This removes the isa attachment so that the pccard unit numbers
-# come out right.
+device		ex0
 device		ep0
 # WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
 # exists only as a PCMCIA device, so there is no ISA attatement needed