diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-12-08 10:58:33 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-12-08 10:59:24 +0100 |
| commit | ec208491936d6adb8a70c3dd4a517cdfe54e823d (patch) | |
| tree | c7291450e8e559c5fbf3360df30999432204af3c /drivers/net/typhoon.c | |
| parent | dmar: Fix build failure without NUMA, warn on bogus RHSA tables and don't abort (diff) | |
| parent | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-ec208491936d6adb8a70c3dd4a517cdfe54e823d.tar.xz linux-ec208491936d6adb8a70c3dd4a517cdfe54e823d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Merge the BIOS workarounds from 2.6.32, and the swiotlb fallback on failure.
Diffstat (limited to 'drivers/net/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index d6d345229fe9..5921f5bdd764 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -108,6 +108,7 @@ static const int multicast_filter_limit = 32; #include <linux/module.h> #include <linux/kernel.h> +#include <linux/sched.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/errno.h> |