patch-2.1.87 linux/arch/m68k/defconfig

Next file: linux/arch/m68k/ifpsp060/iskeleton.S
Previous file: linux/arch/m68k/config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.86/linux/arch/m68k/defconfig linux/arch/m68k/defconfig
@@ -42,11 +42,6 @@
 CONFIG_BINFMT_AOUT=y
 CONFIG_BINFMT_ELF=y
 CONFIG_ZORRO=y
-CONFIG_AMIFB_OCS=y
-CONFIG_AMIFB_ECS=y
-CONFIG_AMIFB_AGA=y
-# CONFIG_FB_CYBER is not set
-# CONFIG_FB_RETINAZ3 is not set
 # CONFIG_AMIGA_GSP is not set
 # CONFIG_GSP_RESOLVER is not set
 # CONFIG_GSP_A2410 is not set
@@ -54,7 +49,8 @@
 #
 # Block device driver configuration
 #
-CONFIG_BLK_DEV_FD=y
+CONFIG_AMIGA_FLOPPY=y
+CONFIG_ATARI_FLOPPY=y
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_IDE is not set
 # CONFIG_BLK_DEV_IDEDISK is not set
@@ -62,6 +58,7 @@
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_BLK_DEV_IDEDOUBLER is not set
 # CONFIG_AMIGA_Z2RAM is not set
 # CONFIG_ATARI_ACSI is not set
 # CONFIG_ACSI_MULTI_LUN is not set
@@ -132,6 +129,9 @@
 # CONFIG_BLZ2060_SCSI is not set
 # CONFIG_BLZ1230_SCSI is not set
 # CONFIG_FASTLANE_SCSI is not set
+# CONFIG_A4000T_SCSI is not set
+# CONFIG_A4091_SCSI is not set
+# CONFIG_WARPENGINE_SCSI is not set
 CONFIG_ATARI_SCSI=y
 
 #
@@ -169,6 +169,21 @@
 # CONFIG_AFFS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_UFS_FS is not set
+
+#
+# Frame buffer devices
+#
+CONFIG_FB_AMIGA=y
+CONFIG_FB_AMIGA_OCS=y
+CONFIG_FB_AMIGA_ECS=y
+CONFIG_FB_AMIGA_AGA=y
+# CONFIG_FB_CYBER is not set
+# CONFIG_FB_RETINAZ3 is not set
+# CONFIG_FB_ATARI is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FBCON_ADVANCED is not set
+
+CONFIG_NLS_CODEPAGE_437=y
 
 #
 # Character devices

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov