diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-21 21:30:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-21 21:30:58 -0800 |
| commit | c46920dadba65856eb1a1f1ffa1b350875db1228 (patch) | |
| tree | 78199a497b70bc6c449c761a6cc4cb223426e0cd /drivers/net/wan/c101.c | |
| parent | f5f4cf08467db10de061a1b90037a56a360d3554 (diff) | |
| parent | 6476a907b57d9229de7807aeea534ad45e19a4ce (diff) | |
Merge branch 'for-david' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
Diffstat (limited to 'drivers/net/wan/c101.c')
| -rw-r--r-- | drivers/net/wan/c101.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c index c8e563106a4..b46897996f7 100644 --- a/drivers/net/wan/c101.c +++ b/drivers/net/wan/c101.c @@ -88,7 +88,7 @@ static card_t **new_card = &first_card; /* EDA address register must be set in EDAL, EDAH order - 8 bit ISA bus */ #define sca_outw(value, reg, card) do { \ writeb(value & 0xFF, (card)->win0base + C101_SCA + (reg)); \ - writeb((value >> 8 ) & 0xFF, (card)->win0base + C101_SCA + (reg+1));\ + writeb((value >> 8 ) & 0xFF, (card)->win0base + C101_SCA + (reg + 1));\ } while(0) #define port_to_card(port) (port) @@ -113,7 +113,7 @@ static inline void openwin(card_t *card, u8 page) } -#include "hd6457x.c" +#include "hd64570.c" static inline void set_carrier(port_t *port) @@ -381,7 +381,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) return result; } - sca_init_sync_port(card); /* Set up C101 memory */ + sca_init_port(card); /* Set up C101 memory */ set_carrier(card); printk(KERN_INFO "%s: Moxa C101 on IRQ%u," |