diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
| commit | 7e66eaf14e19c032433be7c4df3c892fa2a5282f (patch) | |
| tree | 56b0d5f9d16eb18744e102f3f216715196cd62e6 /drivers/net/tlan.c | |
| parent | d3654d7ef3adad0083525cfb6fe27be62cb83d0d (diff) | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
Merge commit 'v3.1-rc4' into next
Diffstat (limited to 'drivers/net/tlan.c')
| -rw-r--r-- | drivers/net/tlan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index ace6404e2fa..145871b3130 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c @@ -29,8 +29,10 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/hardirq.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/eisa.h> #include <linux/pci.h> |