diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-02-18 09:43:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2004-02-18 09:43:56 -0500 |
| commit | 7fcc6d07fe8f897afbc4dcf87d7442195826503c (patch) | |
| tree | 84bd07eb8b337b500151c3f4b45d5081cd282ddd | |
| parent | 150e4b7c5d279b53c6bb20a0d9c904e517c859ca (diff) | |
[PATCH] eepro100.c warning fix
drivers/net/eepro100.c:545: warning: `poll_speedo' declared `static' but never defined
| -rw-r--r-- | drivers/net/eepro100.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index e5f9e1feb7ae..f33d6018c962 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -542,7 +542,6 @@ static int speedo_start_xmit(struct sk_buff *skb, struct net_device *dev); static void speedo_refill_rx_buffers(struct net_device *dev, int force); static int speedo_rx(struct net_device *dev); static void speedo_tx_buffer_gc(struct net_device *dev); -static void poll_speedo (struct net_device *dev); static irqreturn_t speedo_interrupt(int irq, void *dev_instance, struct pt_regs *regs); static int speedo_close(struct net_device *dev); static struct net_device_stats *speedo_get_stats(struct net_device *dev); @@ -655,6 +654,23 @@ err_out_none: return -ENODEV; } +#ifdef CONFIG_NET_POLL_CONTROLLER +/* + * Polling 'interrupt' - used by things like netconsole to send skbs + * without having to re-enable interrupts. It's not called while + * the interrupt routine is executing. + */ + +static void poll_speedo (struct net_device *dev) +{ + /* disable_irq is not very nice, but with the funny lockless design + we have no other choice. */ + disable_irq(dev->irq); + speedo_interrupt (dev->irq, dev, NULL); + enable_irq(dev->irq); +} +#endif + static int __devinit speedo_found1(struct pci_dev *pdev, long ioaddr, int card_idx, int acpi_idle_state) { @@ -1679,23 +1695,6 @@ static irqreturn_t speedo_interrupt(int irq, void *dev_instance, struct pt_regs return IRQ_RETVAL(handled); } -#ifdef CONFIG_NET_POLL_CONTROLLER -/* - * Polling 'interrupt' - used by things like netconsole to send skbs - * without having to re-enable interrupts. It's not called while - * the interrupt routine is executing. - */ - -static void poll_speedo (struct net_device *dev) -{ - /* disable_irq is not very nice, but with the funny lockless design - we have no other choice. */ - disable_irq(dev->irq); - speedo_interrupt (dev->irq, dev, NULL); - enable_irq(dev->irq); -} -#endif - static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry) { struct speedo_private *sp = (struct speedo_private *)dev->priv; |