From owner-freebsd-current  Sat Jul 19 05:23:24 1997
Return-Path: <owner-current>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id FAA23120
          for current-outgoing; Sat, 19 Jul 1997 05:23:24 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id FAA23113
          for <current@freebsd.org>; Sat, 19 Jul 1997 05:23:21 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh@FreeBSD.ORG>
Received: (from jkh@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id FAA23412
	for current@freebsd.org; Sat, 19 Jul 1997 05:21:56 -0700 (PDT)
Date: Sat, 19 Jul 1997 05:21:56 -0700 (PDT)
Message-Id: <199707191221.FAA23412@freefall.freebsd.org>
To: current@FreeBSD.ORG
Subject: I am contemplating the following change...
Sender: owner-current@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

Rationale:

	1. With the advent of visual userconfig, we don't need redundant
	   devices (remember: the goal here is installation, not every
	   possible router/www server/etc configuration).

	2. I think that the historical IRQ value of 5 for ed0 is
	   more historical than valuable. :-)

Comments?

Index: GENERIC
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/GENERIC,v
retrieving revision 1.92
diff -u -r1.92 GENERIC
--- GENERIC	1997/07/15 04:04:45	1.92
+++ GENERIC	1997/07/19 12:15:37
@@ -133,16 +133,14 @@
 device fxp0
 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 ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
 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 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
+device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
 device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
 
 pseudo-device	loop