diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2005-09-23 19:03:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-23 19:03:21 -0400 |
| commit | 536f8098026bde1368bbfcbcb9682a7637b73df2 (patch) | |
| tree | cf83d2e1afa503b6aeba103b55cd1da0af4e7a4c /drivers/net/tulip/xircom_cb.c | |
| parent | [PATCH] Add NVIDIA device ID in sata_nv (diff) | |
| parent | [PATCH] ppc32: Fix configuration of PCI IO space on MPC85xx platform (diff) | |
| download | linux-dev-536f8098026bde1368bbfcbcb9682a7637b73df2.tar.xz linux-dev-536f8098026bde1368bbfcbcb9682a7637b73df2.zip | |
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); static int xircom_close(struct net_device *dev); static void xircom_up(struct xircom_private *card); static struct net_device_stats *xircom_get_stats(struct net_device *dev); -#if CONFIG_NET_POLL_CONTROLLER +#ifdef CONFIG_NET_POLL_CONTROLLER static void xircom_poll_controller(struct net_device *dev); #endif |