Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / net / ethoc.c

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index db0290f..0da6295 100644 (file)
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -11,8 +11,10 @@
  * Written by Thierry Reding <thierry.reding@avionic-design.de>
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/etherdevice.h>
 #include <linux/crc32.h>
+#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mii.h>
 #include <linux/phy.h>
@@ -542,7 +544,7 @@ static irqreturn_t ethoc_interrupt(int irq, void *dev_id)
 
        /* Figure out what triggered the interrupt...
         * The tricky bit here is that the interrupt source bits get
-        * set in INT_SOURCE for an event irregardless of whether that
+        * set in INT_SOURCE for an event regardless of whether that
         * event is masked or not.  Thus, in order to figure out what
         * triggered the interrupt, we need to remove the sources
         * for all events that are currently masked.  This behaviour
@@ -874,6 +876,7 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
        }
 
        spin_unlock_irq(&priv->lock);
+       skb_tx_timestamp(skb);
 out:
        dev_kfree_skb(skb);
        return NETDEV_TX_OK;