Merge bk://gkernel.bkbits.net/net-drivers-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://gkernel.bkbits.net/net-drivers-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
a73597cd · Linus Torvalds · a6ff5cda · 6995b568 · a73597cd · a73597cd
Commit a73597cd authored Nov 07, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

drivers/net/Kconfig drivers/net/Kconfig +1 -1

drivers/net/hamradio/hdlcdrv.c drivers/net/hamradio/hdlcdrv.c +0 -2

No files found.
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1681,7 +1681,7 @@ config VIA_RHINE
 	  (e.g. VT8235).
 	  To compile this driver as a module, choose M here. The module
-	  will be called via-velocity.
+	  will be called via-rhine.
 config VIA_RHINE_MMIO
 	bool "Use MMIO instead of PIO"

--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -549,8 +549,6 @@ static int hdlcdrv_close(struct net_device *dev)
 	netif_stop_queue(dev);
-	netif_stop_queue(dev);
 	if (s->ops && s->ops->close)
 		i = s->ops->close(dev);
 	if (s->skb)