aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Schmitz <schmitzmic@gmail.com>2014-08-09 22:02:33 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-11 15:36:05 -0400
commit65eca28d6df840497d540fb1a83824bf8191f535 (patch)
treef7601ba8d7ad0ac95dcc095f58e818db47a75aa0
parent9951e0484972c9918f8a38ff047cfbad388058d4 (diff)
m68k/atari: EtherNEC - ethernet support (ne)
Support for Atari EtherNEC ROM port adapters in ne.c Signed-off-by: Michael Schmitz <schmitz@debian.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/8390/Kconfig3
-rw-r--r--drivers/net/ethernet/8390/ne.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index 0988811f4e40..2d89bd00de61 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -91,7 +91,8 @@ config MCF8390
91 91
92config NE2000 92config NE2000
93 tristate "NE2000/NE1000 support" 93 tristate "NE2000/NE1000 support"
94 depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX) 94 depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX || \
95 ATARI_ETHERNEC)
95 select CRC32 96 select CRC32
96 ---help--- 97 ---help---
97 If you have a network (Ethernet) card of this type, say Y and read 98 If you have a network (Ethernet) card of this type, say Y and read
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index 58eaa8f34942..de566fb6e0f7 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
@@ -169,6 +169,8 @@ bad_clone_list[] __initdata = {
169#elif defined(CONFIG_PLAT_OAKS32R) || \ 169#elif defined(CONFIG_PLAT_OAKS32R) || \
170 defined(CONFIG_MACH_TX49XX) 170 defined(CONFIG_MACH_TX49XX)
171# define DCR_VAL 0x48 /* 8-bit mode */ 171# define DCR_VAL 0x48 /* 8-bit mode */
172#elif defined(CONFIG_ATARI) /* 8-bit mode on Atari, normal on Q40 */
173# define DCR_VAL (MACH_IS_ATARI ? 0x48 : 0x49)
172#else 174#else
173# define DCR_VAL 0x49 175# define DCR_VAL 0x49
174#endif 176#endif