diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /drivers/net/de600.c | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/de600.c')
| -rw-r--r-- | drivers/net/de600.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/de600.c b/drivers/net/de600.c index 56a100fb9e4..0b930da5d47 100644 --- a/drivers/net/de600.c +++ b/drivers/net/de600.c @@ -179,7 +179,7 @@ static inline void trigger_interrupt(struct net_device *dev) * Copy a buffer to the adapter transmit page memory. * Start sending. */ - + static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned long flags; @@ -272,7 +272,7 @@ static irqreturn_t de600_interrupt(int irq, void *dev_id, struct pt_regs * regs) } spin_lock(&de600_lock); - + select_nic(); irq_status = de600_read_status(dev); |