diff options
| author | Michael Schmitz <schmitzmic@gmail.com> | 2014-08-10 04:02:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-11 21:36:05 +0200 |
| commit | 65eca28d6df840497d540fb1a83824bf8191f535 (patch) | |
| tree | f7601ba8d7ad0ac95dcc095f58e818db47a75aa0 /drivers/net | |
| parent | net: ethernet: ti: cpmac.c: Cleaning up missing null-terminate after strncpy ... (diff) | |
| download | linux-65eca28d6df840497d540fb1a83824bf8191f535.tar.xz linux-65eca28d6df840497d540fb1a83824bf8191f535.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/8390/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne.c | 2 |
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 config NE2000 tristate "NE2000/NE1000 support" - depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX) + depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX || \ + ATARI_ETHERNEC) select CRC32 ---help--- 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 = { #elif defined(CONFIG_PLAT_OAKS32R) || \ defined(CONFIG_MACH_TX49XX) # define DCR_VAL 0x48 /* 8-bit mode */ +#elif defined(CONFIG_ATARI) /* 8-bit mode on Atari, normal on Q40 */ +# define DCR_VAL (MACH_IS_ATARI ? 0x48 : 0x49) #else # define DCR_VAL 0x49 #endif |