diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
| commit | acc696d93dcf993dec123d69d599979e1456ffec (patch) | |
| tree | b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 /drivers/net/ne.c | |
| parent | bf2af2a2027e52b653882fbca840620e896ae081 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/ne.c')
| -rw-r--r-- | drivers/net/ne.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 08b218c5bfbc..93c494bcd18d 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
| @@ -226,7 +226,7 @@ struct net_device * __init ne_probe(int unit) | |||
| 226 | netdev_boot_setup_check(dev); | 226 | netdev_boot_setup_check(dev); |
| 227 | 227 | ||
| 228 | #ifdef CONFIG_TOSHIBA_RBTX4938 | 228 | #ifdef CONFIG_TOSHIBA_RBTX4938 |
| 229 | dev->base_addr = 0x07f20280; | 229 | dev->base_addr = RBTX4938_RTL_8019_BASE; |
| 230 | dev->irq = RBTX4938_RTL_8019_IRQ; | 230 | dev->irq = RBTX4938_RTL_8019_IRQ; |
| 231 | #endif | 231 | #endif |
| 232 | err = do_ne_probe(dev); | 232 | err = do_ne_probe(dev); |