summaryrefslogtreecommitdiffstats
path: root/arch/m68k/defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k/defconfig')
-rw-r--r--arch/m68k/defconfig29
1 files changed, 22 insertions, 7 deletions
diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig
index 65f71d5a9..e9fe2175b 100644
--- a/arch/m68k/defconfig
+++ b/arch/m68k/defconfig
@@ -15,7 +15,7 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_KERNELD is not set
#
-# Platform dependant setup
+# Platform-dependent setup
#
CONFIG_AMIGA=y
# CONFIG_ATARI is not set
@@ -42,11 +42,6 @@ CONFIG_SYSCTL=y
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 @@ CONFIG_AMIFB_AGA=y
#
# 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_FD=y
# 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_GVP11_SCSI=y
# 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
#
@@ -171,6 +171,21 @@ CONFIG_NFS_FS=y
# 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
#
CONFIG_VT=y