diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/skfp/hwmtm.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/skfp/hwmtm.c')
| -rw-r--r-- | drivers/net/skfp/hwmtm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c index af5a755e269d..e26398b5a7dc 100644 --- a/drivers/net/skfp/hwmtm.c +++ b/drivers/net/skfp/hwmtm.c | |||
| @@ -691,7 +691,7 @@ static u_long repair_rxd_ring(struct s_smc *smc, struct s_smt_rx_queue *queue) | |||
| 691 | * interrupt service routine, handles the interrupt requests | 691 | * interrupt service routine, handles the interrupt requests |
| 692 | * generated by the FDDI adapter. | 692 | * generated by the FDDI adapter. |
| 693 | * | 693 | * |
| 694 | * NOTE: The operating system dependent module must garantee that the | 694 | * NOTE: The operating system dependent module must guarantee that the |
| 695 | * interrupts of the adapter are disabled when it calls fddi_isr. | 695 | * interrupts of the adapter are disabled when it calls fddi_isr. |
| 696 | * | 696 | * |
| 697 | * About the USE_BREAK_ISR mechanismn: | 697 | * About the USE_BREAK_ISR mechanismn: |