diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
| commit | 044a500e46742d39d22f1781cfb64ba93b463e39 (patch) | |
| tree | b0313211ea7ba26b90c1083ade0e4c9f486b87db /drivers/s390/net/qeth.h | |
| parent | f6098cf449b81c14a51e48dd22ae47d03126a1de (diff) | |
| parent | 6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'drivers/s390/net/qeth.h')
| -rw-r--r-- | drivers/s390/net/qeth.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h index 3a0285669adf..2ad4797ce024 100644 --- a/drivers/s390/net/qeth.h +++ b/drivers/s390/net/qeth.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include "qeth_mpc.h" | 25 | #include "qeth_mpc.h" |
| 26 | 26 | ||
| 27 | #define VERSION_QETH_H "$Revision: 1.139 $" | 27 | #define VERSION_QETH_H "$Revision: 1.142 $" |
| 28 | 28 | ||
| 29 | #ifdef CONFIG_QETH_IPV6 | 29 | #ifdef CONFIG_QETH_IPV6 |
| 30 | #define QETH_VERSION_IPV6 ":IPv6" | 30 | #define QETH_VERSION_IPV6 ":IPv6" |
| @@ -1172,7 +1172,7 @@ extern int | |||
| 1172 | qeth_realloc_buffer_pool(struct qeth_card *, int); | 1172 | qeth_realloc_buffer_pool(struct qeth_card *, int); |
| 1173 | 1173 | ||
| 1174 | extern int | 1174 | extern int |
| 1175 | qeth_set_large_send(struct qeth_card *); | 1175 | qeth_set_large_send(struct qeth_card *, enum qeth_large_send_types); |
| 1176 | 1176 | ||
| 1177 | extern void | 1177 | extern void |
| 1178 | qeth_fill_header(struct qeth_card *, struct qeth_hdr *, | 1178 | qeth_fill_header(struct qeth_card *, struct qeth_hdr *, |