[src/trunk]: src/sys/arch/alpha/conf Make sure that everything in GENERIC is ...

[cjs <cjs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3ccae5adc92f
branches:  trunk
changeset: 480757:3ccae5adc92f
user:      cjs <cjs%NetBSD.org@localhost>
date:      Wed Jan 19 07:04:23 2000 +0000

description:
Make sure that everything in GENERIC is in ALPHA, and that the two files
have config lines in the same order to make diffing easier.

diffstat:

 sys/arch/alpha/conf/GENERIC |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 361486e5d22a -r 3ccae5adc92f sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Wed Jan 19 07:03:35 2000 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Wed Jan 19 07:04:23 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.139 2000/01/19 03:01:46 mycroft Exp $
+# $NetBSD: GENERIC,v 1.140 2000/01/19 07:04:23 cjs Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 
@@ -37,8 +37,8 @@
 file-system    MFS             # Memory-based file system
 file-system    CD9660          # ISO-9660 CD-ROM FS (w/RockRidge extensions)
 file-system    MSDOSFS         # MS-DOS-compatible file system
+file-system    NTFS            # Windows/NT file system (experimental)
 file-system    NFS             # Sun NFS-compatible file system client
-file-system    NTFS            # Windows/NT file system (experimental)
 #file-system   KERNFS
 #file-system   PROCFS
 
@@ -248,7 +248,7 @@
 
 # ISA devices
 mcclock* at    isa? port 0x70
-pckbc0 at      isa?                            # PC keyboard controller
+pckbc* at      isa?                            # PC keyboard controller
 pckbd* at      pckbc?                          # PC keyboard (kbd port)
 pms*   at      pckbc?                          # PS/2-style mouse (aux port)
 pcppi* at      isa?                            # PC prog. periph. interface
@@ -264,12 +264,12 @@
 depca0 at      isa? port 0x300 iomem 0xd0000 iosiz 0x10000 irq 5       # DEPCA
 depca1 at      isa? port 0x200 iomem 0xd8000 iosiz 0x8000 irq 10       # DEPCA
 le*    at      depca?
-we0     at     isa? port 0x280 iomem 0xd0000 irq 9  # WD/SMC Ethernet
-we1     at     isa? port 0x300 iomem 0xcc000 irq 10
 lpt*   at      isa? port 0x3bc irq 7           # standard parallel port
 vga*   at      isa?                            # ISA (EISA: XXX) VGA
 wdc0   at      isa? port 0x1f0 irq 14          # ST506/ESDI/IDE controllers
 wdc1   at      isa? port 0x170 irq 15
+we0     at     isa? port 0x280 iomem 0xd0000 irq 9  # WD/SMC Ethernet
+we1     at     isa? port 0x300 iomem 0xcc000 irq 10
 #wss*  at      isa? port 0x530 irq 9 drq 0     # Windows Sound System
 #audio*        at      wss?
 #midi* at      wss?