aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs/multi_defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k/configs/multi_defconfig')
-rw-r--r--arch/m68k/configs/multi_defconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index a0b539c99ad2..80ea4b4da872 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -39,6 +39,7 @@ CONFIG_SUN3X=y
39CONFIG_Q40=y 39CONFIG_Q40=y
40CONFIG_ZORRO=y 40CONFIG_ZORRO=y
41CONFIG_AMIGA_PCMCIA=y 41CONFIG_AMIGA_PCMCIA=y
42CONFIG_ATARI_ROM_ISA=y
42CONFIG_ZORRO_NAMES=y 43CONFIG_ZORRO_NAMES=y
43# CONFIG_COMPACTION is not set 44# CONFIG_COMPACTION is not set
44CONFIG_CLEANCACHE=y 45CONFIG_CLEANCACHE=y
@@ -366,13 +367,14 @@ CONFIG_MVME16x_NET=y
366CONFIG_MACSONIC=y 367CONFIG_MACSONIC=y
367CONFIG_HYDRA=y 368CONFIG_HYDRA=y
368CONFIG_MAC8390=y 369CONFIG_MAC8390=y
369CONFIG_NE2000=m 370CONFIG_NE2000=y
370CONFIG_APNE=y 371CONFIG_APNE=y
371CONFIG_ZORRO8390=y 372CONFIG_ZORRO8390=y
372# CONFIG_NET_VENDOR_QUALCOMM is not set 373# CONFIG_NET_VENDOR_QUALCOMM is not set
373# CONFIG_NET_VENDOR_ROCKER is not set 374# CONFIG_NET_VENDOR_ROCKER is not set
374# CONFIG_NET_VENDOR_SAMSUNG is not set 375# CONFIG_NET_VENDOR_SAMSUNG is not set
375# CONFIG_NET_VENDOR_SEEQ is not set 376# CONFIG_NET_VENDOR_SEEQ is not set
377CONFIG_SMC91X=y
376# CONFIG_NET_VENDOR_STMICRO is not set 378# CONFIG_NET_VENDOR_STMICRO is not set
377# CONFIG_NET_VENDOR_VIA is not set 379# CONFIG_NET_VENDOR_VIA is not set
378# CONFIG_NET_VENDOR_WIZNET is not set 380# CONFIG_NET_VENDOR_WIZNET is not set
@@ -452,6 +454,8 @@ CONFIG_NATFEAT=y
452CONFIG_NFBLOCK=y 454CONFIG_NFBLOCK=y
453CONFIG_NFCON=y 455CONFIG_NFCON=y
454CONFIG_NFETH=y 456CONFIG_NFETH=y
457CONFIG_ATARI_ETHERNAT=y
458CONFIG_ATARI_ETHERNEC=y
455CONFIG_ATARI_DSP56K=m 459CONFIG_ATARI_DSP56K=m
456CONFIG_AMIGA_BUILTIN_SERIAL=y 460CONFIG_AMIGA_BUILTIN_SERIAL=y
457CONFIG_SERIAL_CONSOLE=y 461CONFIG_SERIAL_CONSOLE=y