tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by

Atsushi Nemoto and committed by
Jeff Garzik c7e65c17 85a73b33

+3 -3
+1 -1
drivers/net/Kconfig
··· 1172 1172 1173 1173 config NE2000 1174 1174 tristate "NE2000/NE1000 support" 1175 - depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938 1175 + depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX 1176 1176 select CRC32 1177 1177 ---help--- 1178 1178 If you have a network (Ethernet) card of this type, say Y and read
+2 -2
drivers/net/ne.c
··· 118 118 {"E-LAN100", "E-LAN200", {0x00, 0x00, 0x5d}}, /* Broken ne1000 clones */ 119 119 {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo */ 120 120 {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek chip */ 121 - #if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) 121 + #ifdef CONFIG_MACH_TX49XX 122 122 {"RBHMA4X00-RTL8019", "RBHMA4X00/RTL8019", {0x00, 0x60, 0x0a}}, /* Toshiba built-in */ 123 123 #endif 124 124 {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */ ··· 142 142 #if defined(CONFIG_PLAT_MAPPI) 143 143 # define DCR_VAL 0x4b 144 144 #elif defined(CONFIG_PLAT_OAKS32R) || \ 145 - defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) 145 + defined(CONFIG_MACH_TX49XX) 146 146 # define DCR_VAL 0x48 /* 8-bit mode */ 147 147 #else 148 148 # define DCR_VAL 0x49