diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-04-30 11:27:58 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-05-08 01:23:09 -0400 |
commit | 57e386ce9d136261bc60a5223f39b179a3c11046 (patch) | |
tree | ec7c47c0bbe8e60b589dc5055732f1d097202cdd /drivers/net | |
parent | 1c08bf10658921dafae8d66be0effc915a209ab0 (diff) |
ne: MIPS: Use platform_driver for ne on RBTX49XX
This patch lets RBTX49XX boards use generic platform_driver interface
for the ne driver.
* Use platform_device to pass ioaddr and irq to the ne driver.
* Remove unnecessary ifdefs for RBTX49XX from the ne driver.
* Make the ne driver selectable on these boards regardless of CONFIG_ISA
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/ne.c | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 279ec625cec4..372f25716b5b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -1104,7 +1104,7 @@ config ETH16I | |||
1104 | 1104 | ||
1105 | config NE2000 | 1105 | config NE2000 |
1106 | tristate "NE2000/NE1000 support" | 1106 | tristate "NE2000/NE1000 support" |
1107 | depends on NET_ISA || (Q40 && m) || M32R | 1107 | depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938 |
1108 | select CRC32 | 1108 | select CRC32 |
1109 | ---help--- | 1109 | ---help--- |
1110 | If you have a network (Ethernet) card of this type, say Y and read | 1110 | If you have a network (Ethernet) card of this type, say Y and read |
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 22d6fe45375e..c9f74bf5f491 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
@@ -56,10 +56,6 @@ static const char version2[] = | |||
56 | #include <asm/system.h> | 56 | #include <asm/system.h> |
57 | #include <asm/io.h> | 57 | #include <asm/io.h> |
58 | 58 | ||
59 | #if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) | ||
60 | #include <asm/tx4938/rbtx4938.h> | ||
61 | #endif | ||
62 | |||
63 | #include "8390.h" | 59 | #include "8390.h" |
64 | 60 | ||
65 | #define DRV_NAME "ne" | 61 | #define DRV_NAME "ne" |
@@ -232,10 +228,6 @@ struct net_device * __init ne_probe(int unit) | |||
232 | sprintf(dev->name, "eth%d", unit); | 228 | sprintf(dev->name, "eth%d", unit); |
233 | netdev_boot_setup_check(dev); | 229 | netdev_boot_setup_check(dev); |
234 | 230 | ||
235 | #ifdef CONFIG_TOSHIBA_RBTX4938 | ||
236 | dev->base_addr = RBTX4938_RTL_8019_BASE; | ||
237 | dev->irq = RBTX4938_RTL_8019_IRQ; | ||
238 | #endif | ||
239 | err = do_ne_probe(dev); | 231 | err = do_ne_probe(dev); |
240 | if (err) | 232 | if (err) |
241 | goto out; | 233 | goto out; |