diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-10-24 12:57:05 -0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2010-10-24 12:57:05 -0400 |
| commit | 6d4121f6c20a0e86231d52f535f1c82423b3326f (patch) | |
| tree | 5c235cac699ca86b504850aa663ddadde0455a61 /drivers/net/hp.c | |
| parent | 92a5bbc11ff2442a54b2f1d313088c245828ef4e (diff) | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
Merge branch 'master' into for-linus
Conflicts:
include/linux/percpu.h
mm/percpu.c
Diffstat (limited to 'drivers/net/hp.c')
| -rw-r--r-- | drivers/net/hp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/hp.c b/drivers/net/hp.c index 86ececd3c658..d15d2f2ba78e 100644 --- a/drivers/net/hp.c +++ b/drivers/net/hp.c | |||
| @@ -204,10 +204,10 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) | |||
| 204 | ei_status.rx_start_page = HP_START_PG + TX_PAGES; | 204 | ei_status.rx_start_page = HP_START_PG + TX_PAGES; |
| 205 | ei_status.stop_page = wordmode ? HP_16BSTOP_PG : HP_8BSTOP_PG; | 205 | ei_status.stop_page = wordmode ? HP_16BSTOP_PG : HP_8BSTOP_PG; |
| 206 | 206 | ||
| 207 | ei_status.reset_8390 = &hp_reset_8390; | 207 | ei_status.reset_8390 = hp_reset_8390; |
| 208 | ei_status.get_8390_hdr = &hp_get_8390_hdr; | 208 | ei_status.get_8390_hdr = hp_get_8390_hdr; |
| 209 | ei_status.block_input = &hp_block_input; | 209 | ei_status.block_input = hp_block_input; |
| 210 | ei_status.block_output = &hp_block_output; | 210 | ei_status.block_output = hp_block_output; |
| 211 | hp_init_card(dev); | 211 | hp_init_card(dev); |
| 212 | 212 | ||
| 213 | retval = register_netdev(dev); | 213 | retval = register_netdev(dev); |