diff --git a/[refs] b/[refs] index 8812b15dc328..4c1612a3ad03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32e7bfc41110bc8f29ec0f293c3bcee6645fef34 +refs/heads/master: b747caf365b4121903b26d1cd65454c7bc607184 diff --git a/trunk/drivers/net/ariadne.c b/trunk/drivers/net/ariadne.c index c35af3e106b1..e2c202493fa7 100644 --- a/trunk/drivers/net/ariadne.c +++ b/trunk/drivers/net/ariadne.c @@ -123,9 +123,7 @@ static void ariadne_reset(struct net_device *dev); static irqreturn_t ariadne_interrupt(int irq, void *data); static int ariadne_close(struct net_device *dev); static struct net_device_stats *ariadne_get_stats(struct net_device *dev); -#ifdef HAVE_MULTICAST static void set_multicast_list(struct net_device *dev); -#endif static void memcpyw(volatile u_short *dest, u_short *src, int len)