diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 13:08:37 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 13:08:37 +0200 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /drivers/s390/net/qeth_main.c | |
| parent | [POWERPC] CPM_UART: Removed __init from cpm_uart_init_portdesc to fix warning (diff) | |
| parent | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan... (diff) | |
| download | linux-2ecf042ef530dd0943e41d84b6344f507941af3e.tar.xz linux-2ecf042ef530dd0943e41d84b6344f507941af3e.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/s390/net/qeth_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index 29d176036e5c..0b96d49dd636 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c @@ -2860,7 +2860,7 @@ qeth_flush_buffers(struct qeth_qdio_out_q *queue, int under_int, if (!atomic_read(&queue->set_pci_flags_count)){ /* * there's no outstanding PCI any more, so we - * have to request a PCI to be sure the the PCI + * have to request a PCI to be sure that the PCI * will wake at some time in the future then we * can flush packed buffers that might still be * hanging around, which can happen if no |