diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-08-04 09:09:27 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-08-04 09:09:27 +0200 |
commit | d7619fe39d9769b4d4545cc511c891deea18ae08 (patch) | |
tree | 0a902533414001075b2245825e145cc2e35ce985 /drivers/net/greth.c | |
parent | 9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae (diff) | |
parent | ed8f37370d83e695c0a4fa5d5fc7a83ecb947526 (diff) |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'drivers/net/greth.c')
-rw-r--r-- | drivers/net/greth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/greth.c b/drivers/net/greth.c index 672f096fe09..16ce45c1193 100644 --- 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> |