diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:25:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:25:02 -0400 |
| commit | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (patch) | |
| tree | d0abb5c923a7a3eca2d4b2c3e1964bf484870909 /drivers/net/tulip/xircom_cb.c | |
| parent | 165415f700b0c77fa1f8db6198f48582639adf78 (diff) | |
| parent | 87e807b6c461bbd449496a4c3ab78ab164a4ba97 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/tulip/xircom_cb.c')
| -rw-r--r-- | drivers/net/tulip/xircom_cb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index 26cc4f6378c7..60d1e05ab732 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c | |||
| @@ -117,7 +117,7 @@ static int xircom_open(struct net_device *dev); | |||
| 117 | static int xircom_close(struct net_device *dev); | 117 | static int xircom_close(struct net_device *dev); |
| 118 | static void xircom_up(struct xircom_private *card); | 118 | static void xircom_up(struct xircom_private *card); |
| 119 | static struct net_device_stats *xircom_get_stats(struct net_device *dev); | 119 | static struct net_device_stats *xircom_get_stats(struct net_device *dev); |
| 120 | #if CONFIG_NET_POLL_CONTROLLER | 120 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 121 | static void xircom_poll_controller(struct net_device *dev); | 121 | static void xircom_poll_controller(struct net_device *dev); |
| 122 | #endif | 122 | #endif |
| 123 | 123 | ||