summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2004-10-29 20:33:42 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2004-10-29 20:33:42 +0000
commitf9d498e8b65b992ccf018711a3939be923997650 (patch)
treeb37e55d87348f9a6de714c9699929b05024b455a
parent0fff8120758bc3d3acbdbb3ab95f6565c54d1fe5 (diff)
cleanup and put app eps in one place like other drivers
-rw-r--r--sys/arch/hppa/conf/GENERIC22
-rw-r--r--sys/arch/hppa/conf/RAMDISK12
2 files changed, 17 insertions, 17 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 63518035a06..1cc00fd440b 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.61 2004/10/28 19:29:29 miod Exp $
+# $OpenBSD: GENERIC,v 1.62 2004/10/29 20:33:41 mickey Exp $
# Machine architecture; required by config(8)
machine hppa
@@ -71,9 +71,9 @@ option PCMCIADEBUG,PCMCIAVERBOSE
pcmcia* at cardslot?
# PCI USB Controllers
-#ehci* at pci? # Enhanced Host Controller
-#uhci* at pci? # Universal Host Controller (Intel)
-#ohci* at pci? # Open Host Controller
+#ehci* at pci? # Enhanced Host Controller
+#uhci* at pci? # Universal Host Controller (Intel)
+#ohci* at pci? # Open Host Controller
# USB bus support
#usb* at ehci?
@@ -172,7 +172,7 @@ com3 at gsc0 offset 0x4060 irq 13
lpt0 at gsc? irq 7 # both com and lpt are on WD16C552
ie0 at gsc0 irq 8 # 82C596DX/CA ether
#ie1 at gsc1 irq 8
-#ie* at eisa? slot ?
+#ie* at eisa?
#ie* at isa? port 0x360 iomem 0xd0000 irq 7
#ie* at isa? port 0x300 irq 10
#ie* at pci?
@@ -188,10 +188,7 @@ gsckbc* at gsc? irq 26
gsckbd* at gsckbc? # PS/2 keyboard
pms* at gsckbc? # PS/2 mouse
-# EISA devices
#sh* at eisa? # Interphase Seahawk 4811 EISA/FDDI
-#ep* at eisa? # 3C579 ethernet
-#ep* at pci? # 3c59x ethernets
#ahb* at eisa? # Adaptec 174[024] SCSI controllers
#scsibus* at aha?
#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers
@@ -212,12 +209,15 @@ scsibus* at siop?
#ti* at pci? # Alteon Tigon 1Gb ethernet
#txp* at pci? # 3com 3CR990
#fpa* at pci? # DEC DEFPA FDDI
+#de* at pci? # 21x4[012]-based Ethernet
+#de* at eisa?
dc* at pci? # 21143, "tulip" clone ethernet
#dc* at cardbus?
#rl* at pci? # RealTek 81[23]9 ethernet
-#rl* at cardbus?
-#ep* at pci? # 3c59x
-#ep* at cardbus?
+#rl* at cardbus?
+#ep* at pci? # 3c59x ethernet
+#ep* at eisa? # 3c579 ethernet
+#ep* at pcmcia? # 3c589 ethernet
#xl* at pci? # 3C9xx ethernet
#xl* at cardbus?
fxp* at pci? # EtherExpress 10/100B ethernet
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index b8c35ed6c3f..16425dfc478 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.41 2004/10/28 19:29:29 miod Exp $
+# $OpenBSD: RAMDISK,v 1.42 2004/10/29 20:33:41 mickey Exp $
#
# Diskless kernel config
#
@@ -202,10 +202,7 @@ gsckbc* at gsc? irq 26
gsckbd* at gsckbc? # PS/2 keyboard
#pms* at gsckbc? # PS/2 mouse
-# EISA devices
#sh* at eisa? # Interphase Seahawk 4811 EISA/FDDI
-#ep* at eisa? # 3C579 ethernet
-#ep* at pci? # 3c59x ethernets
#ahb* at eisa? # Adaptec 174[024] SCSI controllers
#scsibus* at aha?
#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers
@@ -226,12 +223,15 @@ scsibus* at siop?
#ti* at pci? # Alteon Tigon 1Gb ethernet
#txp* at pci? # 3com 3CR990
#fpa* at pci? # DEC DEFPA FDDI
+#de* at pci? # 21x4[012]-based Ethernet
+#de* at eisa?
dc* at pci? # 21143, "tulip" clone ethernet
#dc* at cardbus?
#rl* at pci? # RealTek 81[23]9 ethernet
#rl* at cardbus?
-#ep* at pci? # 3c59x
-#ep* at cardbus?
+#ep* at pci? # 3c59x ethernet
+#ep* at eisa? # 3c579 ethernet
+#ep* at pcmcia? # 3c589 ethernet
#xl* at pci? # 3C9xx ethernet
#xl* at cardbus?
fxp* at pci? # EtherExpress 10/100B ethernet