Add back all the stuff I've had to remove due to kernel growth + MSDOSFS

diff --git a/sys/arch/amiga/conf/FILIPPA b/sys/arch/amiga/conf/FILIPPA
index 564c9c1..ec51c1c 100644 (file)
--- a/sys/arch/amiga/conf/FILIPPA
+++ b/sys/arch/amiga/conf/FILIPPA
@@ -1,9 +1,7 @@
-#      $OpenBSD: FILIPPA,v 1.5 1996/05/04 13:40:24 niklas Exp $
+#      $OpenBSD: FILIPPA,v 1.6 1996/05/07 10:05:20 niklas Exp $
 
 #
-# GENERIC AMIGA
-#
-# This configuration file contains all possible options
+# Niklas' AMIGA with ISA support
 #
 
 include "std.amiga"
@@ -55,12 +53,12 @@ options             KERNFS          # Kernel parameter filesystem (Recommended)
 options                FDESC           # /dev/fd filesystem
 options                NULLFS          # Loopback filesystem
 options                FIFO            # FIFO operations on vnodes (Recommended)
-#options               ADOSFS          # AmigaDOS file system
-#options               "CD9660"        # ISO 9660 file system, with Rock Ridge
+options                ADOSFS          # AmigaDOS file system
+options                "CD9660"        # ISO 9660 file system, with Rock Ridge
 options                UNION           # union file system
-#options               UMAPFS          # uid/gid remapping filesystem
+options                UMAPFS          # uid/gid remapping filesystem
 #options       PORTAL          # Portal filesystem
-#options       MSDOSFS         # MS-DOS filesystem
+options                MSDOSFS         # MS-DOS filesystem
 
 
 #
@@ -204,15 +202,15 @@ sd1       at scsibus0 target 3 lun ?      # scsi disks
 
 st0    at scsibus0 target 5 lun ?      # scsi tapes
 st*    at scsibus? target ? lun ?      # scsi tapes
-#cd0   at scsibus0 target 6 lun ?      # scsi cd's
-#cd*   at scsibus? target ? lun ?      # scsi cd's
+cd0    at scsibus0 target 6 lun ?      # scsi cd's
+cd*    at scsibus? target ? lun ?      # scsi cd's
 #ss*   at scsibus? target ? lun ?      # scsi scanners
 
 ggbus* at zbus0                        # Goldengate bridge
 isa*   at ggbus?
 
-#cross*        at zbus0                        # CrossLink bridge
-#isa*  at cross?
+cross* at zbus0                        # CrossLink bridge
+isa*   at cross?
 
 com0   at isa? port 0x3f8 irq 4        # Standard PC serial ports
 com1   at isa? port 0x2f8 irq 3
@@ -229,9 +227,9 @@ com7        at ast? slave ? flags 1
 com8   at isa? port 0x0f0 irq 11       # Crosslink builtin ports
 com9   at isa? port 0x0f8 irq 10
 
-#lpt0  at isa? port 0x378 irq 7        # Standard PC parallel ports
-#lpt1  at isa? port 0x278
-#lpt2  at isa? port 0x3bc
+lpt0   at isa? port 0x378 irq 7        # Standard PC parallel ports
+lpt1   at isa? port 0x278
+lpt2   at isa? port 0x3bc
 
 # XXX should be ed0 but clashes with Zorro ed device
 isaed0 at isa? port 0x300 iomem 0xcc000 irq 10 # WD/SMC, 3C503, and NE[12]000
@@ -239,7 +237,7 @@ isaed0      at isa? port 0x300 iomem 0xcc000 irq 10 # WD/SMC, 3C503, and NE[12]000
 fd*    at fdc0 unit ?
 
 pseudo-device  sl                      # slip
-#pseudo-device ppp                     # ppp
+pseudo-device  ppp                     # ppp
 pseudo-device  view    10              # views
 pseudo-device  pty     32              # pseudo terminals
 pseudo-device  loop                    # network loopback