Commit 7a6b6776 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/jgarzik/misc-2.5

into home.osdl.org:/home/torvalds/v2.5/linux
parents 040c13e6 0c7cadd6
......@@ -67,7 +67,6 @@ extern int elplus_probe(struct net_device *);
extern int ac3200_probe(struct net_device *);
extern int es_probe(struct net_device *);
extern int lne390_probe(struct net_device *);
extern int ne3210_probe(struct net_device *);
extern int e2100_probe(struct net_device *);
extern int ni5010_probe(struct net_device *);
extern int ni52_probe(struct net_device *);
......@@ -154,9 +153,6 @@ static struct devprobe eisa_probes[] __initdata = {
#endif
#ifdef CONFIG_LNE390
{lne390_probe, 0},
#endif
#ifdef CONFIG_NE3210
{ne3210_probe, 0},
#endif
{NULL, 0},
};
......
This diff is collapsed.
......@@ -721,9 +721,9 @@ static int arlan_hw_tx(struct net_device *dev, char *buf, int length)
else
{
netif_stop_queue (dev);
return -1;
IFDEBUG(ARLAN_DEBUG_TX_CHAIN)
printk(KERN_ERR "TX TAIL & HEAD full, return, tailStart %d headEnd %d\n", tailStarts, headEnds);
return -1;
}
priv->out_bytes += length;
priv->out_bytes10 += length;
......
......@@ -359,11 +359,11 @@ static inline int hdlcdrv_ptt(struct hdlcdrv_state *s)
void hdlcdrv_receiver(struct net_device *, struct hdlcdrv_state *);
void hdlcdrv_transmitter(struct net_device *, struct hdlcdrv_state *);
void hdlcdrv_arbitrate(struct net_device *, struct hdlcdrv_state *);
int hdlcdrv_register_hdlcdrv(struct net_device *dev, const struct hdlcdrv_ops *ops,
unsigned int privsize, char *ifname,
struct net_device *hdlcdrv_register(const struct hdlcdrv_ops *ops,
unsigned int privsize, const char *ifname,
unsigned int baseaddr, unsigned int irq,
unsigned int dma);
int hdlcdrv_unregister_hdlcdrv(struct net_device *dev);
void hdlcdrv_unregister(struct net_device *dev);
/* -------------------------------------------------------------------- */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment