diff options
Diffstat (limited to 'drivers/net/wan/n2.c')
-rw-r--r-- | drivers/net/wan/n2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c index 5b9cd2d561ca..697715ae80f4 100644 --- a/drivers/net/wan/n2.c +++ b/drivers/net/wan/n2.c | |||
@@ -53,7 +53,7 @@ static const char* devname = "RISCom/N2"; | |||
53 | #define NEED_SCA_MSCI_INTR | 53 | #define NEED_SCA_MSCI_INTR |
54 | #define MAX_TX_BUFFERS 10 | 54 | #define MAX_TX_BUFFERS 10 |
55 | 55 | ||
56 | static char *hw = NULL; /* pointer to hw=xxx command line string */ | 56 | static char *hw; /* pointer to hw=xxx command line string */ |
57 | 57 | ||
58 | /* RISCom/N2 Board Registers */ | 58 | /* RISCom/N2 Board Registers */ |
59 | 59 | ||
@@ -145,7 +145,6 @@ static card_t **new_card = &first_card; | |||
145 | &(card)->ports[port] : NULL) | 145 | &(card)->ports[port] : NULL) |
146 | 146 | ||
147 | 147 | ||
148 | |||
149 | static __inline__ u8 sca_get_page(card_t *card) | 148 | static __inline__ u8 sca_get_page(card_t *card) |
150 | { | 149 | { |
151 | return inb(card->io + N2_PSR) & PSR_PAGEBITS; | 150 | return inb(card->io + N2_PSR) & PSR_PAGEBITS; |
@@ -159,11 +158,9 @@ static __inline__ void openwin(card_t *card, u8 page) | |||
159 | } | 158 | } |
160 | 159 | ||
161 | 160 | ||
162 | |||
163 | #include "hd64570.c" | 161 | #include "hd64570.c" |
164 | 162 | ||
165 | 163 | ||
166 | |||
167 | static void n2_set_iface(port_t *port) | 164 | static void n2_set_iface(port_t *port) |
168 | { | 165 | { |
169 | card_t *card = port->card; | 166 | card_t *card = port->card; |
@@ -478,7 +475,7 @@ static int __init n2_run(unsigned long io, unsigned long irq, | |||
478 | n2_destroy_card(card); | 475 | n2_destroy_card(card); |
479 | return -ENOBUFS; | 476 | return -ENOBUFS; |
480 | } | 477 | } |
481 | sca_init_sync_port(port); /* Set up SCA memory */ | 478 | sca_init_port(port); /* Set up SCA memory */ |
482 | 479 | ||
483 | printk(KERN_INFO "%s: RISCom/N2 node %d\n", | 480 | printk(KERN_INFO "%s: RISCom/N2 node %d\n", |
484 | dev->name, port->phy_node); | 481 | dev->name, port->phy_node); |