diff options
author | Vitaly Bordug <vitb@kernel.crashing.org> | 2007-09-18 12:05:35 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:55 -0400 |
commit | 9b8ee8e7d6b7f2270b19b3425a393d918fe497d3 (patch) | |
tree | 84c6f1bba3bb927385ab1b55b2f0caaf076bad4c /drivers/net/fs_enet/mac-fcc.c | |
parent | aa90f5032129b43569896c1c6c15a706c02c6abf (diff) |
FS_ENET: Add polling support
Signed-off-by: Vitaly Bordug <vitb@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/fs_enet/mac-fcc.c')
-rw-r--r-- | drivers/net/fs_enet/mac-fcc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c index 5603121132cd..64071514d7d5 100644 --- a/drivers/net/fs_enet/mac-fcc.c +++ b/drivers/net/fs_enet/mac-fcc.c | |||
@@ -1,14 +1,14 @@ | |||
1 | /* | 1 | /* |
2 | * FCC driver for Motorola MPC82xx (PQ2). | 2 | * FCC driver for Motorola MPC82xx (PQ2). |
3 | * | 3 | * |
4 | * Copyright (c) 2003 Intracom S.A. | 4 | * Copyright (c) 2003 Intracom S.A. |
5 | * by Pantelis Antoniou <panto@intracom.gr> | 5 | * by Pantelis Antoniou <panto@intracom.gr> |
6 | * | 6 | * |
7 | * 2005 (c) MontaVista Software, Inc. | 7 | * 2005 (c) MontaVista Software, Inc. |
8 | * Vitaly Bordug <vbordug@ru.mvista.com> | 8 | * Vitaly Bordug <vbordug@ru.mvista.com> |
9 | * | 9 | * |
10 | * This file is licensed under the terms of the GNU General Public License | 10 | * This file is licensed under the terms of the GNU General Public License |
11 | * version 2. This program is licensed "as is" without any warranty of any | 11 | * version 2. This program is licensed "as is" without any warranty of any |
12 | * kind, whether express or implied. | 12 | * kind, whether express or implied. |
13 | */ | 13 | */ |
14 | 14 | ||
@@ -92,7 +92,7 @@ static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 mcn, u32 op) | |||
92 | u32 v; | 92 | u32 v; |
93 | int i; | 93 | int i; |
94 | 94 | ||
95 | /* Currently I don't know what feature call will look like. But | 95 | /* Currently I don't know what feature call will look like. But |
96 | I guess there'd be something like do_cpm_cmd() which will require page & sblock */ | 96 | I guess there'd be something like do_cpm_cmd() which will require page & sblock */ |
97 | v = mk_cr_cmd(fpi->cp_page, fpi->cp_block, mcn, op); | 97 | v = mk_cr_cmd(fpi->cp_page, fpi->cp_block, mcn, op); |
98 | W32(cpmp, cp_cpcr, v | CPM_CR_FLG); | 98 | W32(cpmp, cp_cpcr, v | CPM_CR_FLG); |
@@ -548,7 +548,7 @@ int get_regs_len(struct net_device *dev) | |||
548 | * down. We now issue a restart transmit. Since the | 548 | * down. We now issue a restart transmit. Since the |
549 | * errors close the BD and update the pointers, the restart | 549 | * errors close the BD and update the pointers, the restart |
550 | * _should_ pick up without having to reset any of our | 550 | * _should_ pick up without having to reset any of our |
551 | * pointers either. Also, To workaround 8260 device erratum | 551 | * pointers either. Also, To workaround 8260 device erratum |
552 | * CPM37, we must disable and then re-enable the transmitter | 552 | * CPM37, we must disable and then re-enable the transmitter |
553 | * following a Late Collision, Underrun, or Retry Limit error. | 553 | * following a Late Collision, Underrun, or Retry Limit error. |
554 | */ | 554 | */ |