| Message ID | 1443363556-29937-1-git-send-email-ysato@users.sourceforge.jp |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Yoshinori Sato <ysato@users.sourceforge.jp> Date: Sun, 27 Sep 2015 23:19:15 +0900 > @@ -88,7 +88,7 @@ config MCF8390 > config NE2000 > tristate "NE2000/NE1000 support" > depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX || \ > - ATARI_ETHERNEC) > + ATARI_ETHERNEC || H8300) ... > > -#if defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R) > +#if defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R) || \ > + defined(CONFIG_H8300_KANEBEBE) || defined(CONFIG_H8300_AE3069) It makes no sense to test different config symbols for these two things. Either both should use "H8300" or both should use "H8300_KANEBEBE || H8300_AE3069". -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 28 Sep 2015 04:51:30 +0900, David Miller wrote: > > From: Yoshinori Sato <ysato@users.sourceforge.jp> > Date: Sun, 27 Sep 2015 23:19:15 +0900 > > > @@ -88,7 +88,7 @@ config MCF8390 > > config NE2000 > > tristate "NE2000/NE1000 support" > > depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX || \ > > - ATARI_ETHERNEC) > > + ATARI_ETHERNEC || H8300) > ... > > > > -#if defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R) > > +#if defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R) || \ > > + defined(CONFIG_H8300_KANEBEBE) || defined(CONFIG_H8300_AE3069) > > It makes no sense to test different config symbols for these two > things. > > Either both should use "H8300" or both should use > "H8300_KANEBEBE || H8300_AE3069". OK. I'll sent v2.
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig index edf7225..44d7167 100644 --- a/drivers/net/ethernet/8390/Kconfig +++ b/drivers/net/ethernet/8390/Kconfig @@ -88,7 +88,7 @@ config MCF8390 config NE2000 tristate "NE2000/NE1000 support" depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX || \ - ATARI_ETHERNEC) + ATARI_ETHERNEC || H8300) select CRC32 ---help--- If you have a network (Ethernet) card of this type, say Y here. diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c index c063b41..576917c 100644 --- a/drivers/net/ethernet/8390/ne.c +++ b/drivers/net/ethernet/8390/ne.c @@ -422,7 +422,8 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) stop_page = NE1SM_STOP_PG; } -#if defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R) +#if defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R) || \ + defined(CONFIG_H8300_KANEBEBE) || defined(CONFIG_H8300_AE3069) neX000 = ((SA_prom[14] == 0x57 && SA_prom[15] == 0x57) || (SA_prom[14] == 0x42 && SA_prom[15] == 0x42)); #else
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> --- drivers/net/ethernet/8390/Kconfig | 2 +- drivers/net/ethernet/8390/ne.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)