diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-17 11:25:39 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-01-31 09:00:59 -0500 |
commit | 9a10555c6949982e6f98007dc71c15bd8ccb965a (patch) | |
tree | 959d6912c0e49d611841f96f899acabae8e62a88 /arch | |
parent | d3125afbe29967dfe7d61e4b02c9f544edf8989b (diff) |
m68k/defconfig: Enable Atari EtherNAT and EtherNEC Ethernet support
Enable support for Atari EtherNAT (SMC91X) and EtherNEC (NE2000)
Ethernet support in the Atari and multiplatform defconfig files.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index c53bd87bd68c..776964f25774 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -31,6 +31,7 @@ CONFIG_M68030=y | |||
31 | CONFIG_M68040=y | 31 | CONFIG_M68040=y |
32 | CONFIG_M68060=y | 32 | CONFIG_M68060=y |
33 | CONFIG_ATARI=y | 33 | CONFIG_ATARI=y |
34 | CONFIG_ATARI_ROM_ISA=y | ||
34 | # CONFIG_COMPACTION is not set | 35 | # CONFIG_COMPACTION is not set |
35 | CONFIG_CLEANCACHE=y | 36 | CONFIG_CLEANCACHE=y |
36 | CONFIG_ZPOOL=m | 37 | CONFIG_ZPOOL=m |
@@ -313,10 +314,12 @@ CONFIG_ATARILANCE=y | |||
313 | # CONFIG_NET_VENDOR_INTEL is not set | 314 | # CONFIG_NET_VENDOR_INTEL is not set |
314 | # CONFIG_NET_VENDOR_MARVELL is not set | 315 | # CONFIG_NET_VENDOR_MARVELL is not set |
315 | # CONFIG_NET_VENDOR_MICREL is not set | 316 | # CONFIG_NET_VENDOR_MICREL is not set |
317 | CONFIG_NE2000=y | ||
316 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 318 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
317 | # CONFIG_NET_VENDOR_ROCKER is not set | 319 | # CONFIG_NET_VENDOR_ROCKER is not set |
318 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 320 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
319 | # CONFIG_NET_VENDOR_SEEQ is not set | 321 | # CONFIG_NET_VENDOR_SEEQ is not set |
322 | CONFIG_SMC91X=y | ||
320 | # CONFIG_NET_VENDOR_STMICRO is not set | 323 | # CONFIG_NET_VENDOR_STMICRO is not set |
321 | # CONFIG_NET_VENDOR_VIA is not set | 324 | # CONFIG_NET_VENDOR_VIA is not set |
322 | # CONFIG_NET_VENDOR_WIZNET is not set | 325 | # CONFIG_NET_VENDOR_WIZNET is not set |
@@ -371,6 +374,8 @@ CONFIG_NATFEAT=y | |||
371 | CONFIG_NFBLOCK=y | 374 | CONFIG_NFBLOCK=y |
372 | CONFIG_NFCON=y | 375 | CONFIG_NFCON=y |
373 | CONFIG_NFETH=y | 376 | CONFIG_NFETH=y |
377 | CONFIG_ATARI_ETHERNAT=y | ||
378 | CONFIG_ATARI_ETHERNEC=y | ||
374 | CONFIG_ATARI_DSP56K=m | 379 | CONFIG_ATARI_DSP56K=m |
375 | CONFIG_EXT4_FS=y | 380 | CONFIG_EXT4_FS=y |
376 | CONFIG_REISERFS_FS=m | 381 | CONFIG_REISERFS_FS=m |
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 | |||
39 | CONFIG_Q40=y | 39 | CONFIG_Q40=y |
40 | CONFIG_ZORRO=y | 40 | CONFIG_ZORRO=y |
41 | CONFIG_AMIGA_PCMCIA=y | 41 | CONFIG_AMIGA_PCMCIA=y |
42 | CONFIG_ATARI_ROM_ISA=y | ||
42 | CONFIG_ZORRO_NAMES=y | 43 | CONFIG_ZORRO_NAMES=y |
43 | # CONFIG_COMPACTION is not set | 44 | # CONFIG_COMPACTION is not set |
44 | CONFIG_CLEANCACHE=y | 45 | CONFIG_CLEANCACHE=y |
@@ -366,13 +367,14 @@ CONFIG_MVME16x_NET=y | |||
366 | CONFIG_MACSONIC=y | 367 | CONFIG_MACSONIC=y |
367 | CONFIG_HYDRA=y | 368 | CONFIG_HYDRA=y |
368 | CONFIG_MAC8390=y | 369 | CONFIG_MAC8390=y |
369 | CONFIG_NE2000=m | 370 | CONFIG_NE2000=y |
370 | CONFIG_APNE=y | 371 | CONFIG_APNE=y |
371 | CONFIG_ZORRO8390=y | 372 | CONFIG_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 |
377 | CONFIG_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 | |||
452 | CONFIG_NFBLOCK=y | 454 | CONFIG_NFBLOCK=y |
453 | CONFIG_NFCON=y | 455 | CONFIG_NFCON=y |
454 | CONFIG_NFETH=y | 456 | CONFIG_NFETH=y |
457 | CONFIG_ATARI_ETHERNAT=y | ||
458 | CONFIG_ATARI_ETHERNEC=y | ||
455 | CONFIG_ATARI_DSP56K=m | 459 | CONFIG_ATARI_DSP56K=m |
456 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 460 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
457 | CONFIG_SERIAL_CONSOLE=y | 461 | CONFIG_SERIAL_CONSOLE=y |