Merge branch 'btrfs-3.0' into for-linus

[~andy/linux] / drivers / net / greth.c

diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 672f096fe0905d8a59bf6efb495922e51b031c48..16ce45c1193419fc7193f59de18049708ef3a2e2 100644 (file)
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -22,9 +22,11 @@
  *               Marko Isomaki
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>