Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7e65c17 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Jeff Garzik
Browse files

[netdrvr] ne: Use CONFIG_MACH_TX49XX 



After some cleanups in arch/mips area, now MACH_TX49XX is selected for
both TOSHIBA_RBTX4927 and TOSHIBA_RBTX4938.  Fold these two conditions
to one.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 85a73b33

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ config ETH16I 


config NE2000

	tristate "NE2000/NE1000 support"

	depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938

	depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX

	select CRC32

	---help---

	  If you have a network (Ethernet) card of this type, say Y and read

drivers/net/ne.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ bad_clone_list[] __initdata = { 
    {"E-LAN100", "E-LAN200", {0x00, 0x00, 0x5d}}, /* Broken ne1000 clones */

    {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo */

    {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek chip */

#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)

#ifdef CONFIG_MACH_TX49XX

    {"RBHMA4X00-RTL8019", "RBHMA4X00/RTL8019", {0x00, 0x60, 0x0a}},  /* Toshiba built-in */

#endif

    {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */
@@ -142,7 +142,7 @@ bad_clone_list[] __initdata = { 
#if defined(CONFIG_PLAT_MAPPI)

#  define DCR_VAL 0x4b

#elif defined(CONFIG_PLAT_OAKS32R)  || \

   defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)

   defined(CONFIG_MACH_TX49XX)

#  define DCR_VAL 0x48		/* 8-bit mode */

#else

#  define DCR_VAL 0x49