Module Name:	src
Committed By:	jdc
Date:		Wed May 16 21:04:18 UTC 2007

Modified Files:
	src/sys/arch/alpha/conf [netbsd-4]: GENERIC

Log Message:
Pull up revisions 1.306-1.309 (requested by pavel in ticket #645).

Explicitely configure zstty2 at zsc1. The corresponding /dev special file
is /dev/ttyB1 which has minor 2. If this serial port becomes zstty1,
/dev/ttyB1 becomes unusable because the minor number does not match. (The
problem was introduced when we started using the zstty(4) driver instead of
the scc(4) driver between NetBSD 1.6 and 2.0.)

Suggested by Bill Studenmund a long time ago.

Tested on DEC 3000 - 300LX and DEC 3000 - M600.

Merge GENERIC and ALPHA configuration, and remove the latter.  ALPHA was
supposed to be a superset of GENERIC, but sometimes it was not kept up to
date.

As proposed on port-alpha@.

spaces -> tabs in the new zstty lines.

more spaces -> tabs.


To generate a diff of this commit:
cvs rdiff -r1.301.2.1 -r1.301.2.2 src/sys/arch/alpha/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.