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/isdn/hisax/arcofi.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/isdn/hisax/arcofi.c')
-rw-r--r-- | drivers/isdn/hisax/arcofi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/hisax/arcofi.c b/drivers/isdn/hisax/arcofi.c index d30ce5b978c2..85a8fd8dd0b7 100644 --- a/drivers/isdn/hisax/arcofi.c +++ b/drivers/isdn/hisax/arcofi.c @@ -10,6 +10,7 @@ * */ +#include <linux/sched.h> #include "hisax.h" #include "isdnl1.h" #include "isac.h" |