Automatic merge of /spare/repo/netdev-2.6 branch orinoco-hch

4d8e11dc · Jeff Garzik · 21035ffe · 84d8a2fb · 4d8e11dc · 4d8e11dc
Commit 4d8e11dc authored Jun 04, 2005 by Committed by Jeff Garzik Jun 04, 2005
Expand all Show whitespace changes
Inline Side-by-side

Showing with 69 additions and 264 deletions

drivers/net/wireless/orinoco.c drivers/net/wireless/orinoco.c +69 -263

drivers/net/wireless/orinoco.h drivers/net/wireless/orinoco.h +0 -1

No files found.
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
--- a/drivers/net/wireless/orinoco.h
+++ b/drivers/net/wireless/orinoco.h
@@ -119,7 +119,6 @@ extern struct net_device *alloc_orinocodev(int sizeof_card,
 extern void free_orinocodev(struct net_device *dev);
 extern int __orinoco_up(struct net_device *dev);
 extern int __orinoco_down(struct net_device *dev);
-extern int orinoco_stop(struct net_device *dev);
 extern int orinoco_reinit_firmware(struct net_device *dev);
 extern irqreturn_t orinoco_interrupt(int irq, void * dev_id, struct pt_regs *regs);