diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-12-08 09:58:33 +0000 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-12-08 09:59:24 +0000 |
| commit | ec208491936d6adb8a70c3dd4a517cdfe54e823d (patch) | |
| tree | c7291450e8e559c5fbf3360df30999432204af3c /drivers/char/dtlk.c | |
| parent | aa697079ee66315c4b9747a5eb3e48487fb1b8be (diff) | |
| parent | 7b626acb8f983eb83b396ab96cc24b18d635d487 (diff) | |
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/char/dtlk.c')
| -rw-r--r-- | drivers/char/dtlk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c index 52e06589821..045c930e632 100644 --- a/drivers/char/dtlk.c +++ b/drivers/char/dtlk.c @@ -56,6 +56,7 @@ #include <linux/errno.h> /* for -EBUSY */ #include <linux/ioport.h> /* for request_region */ #include <linux/delay.h> /* for loops_per_jiffy */ +#include <linux/sched.h> #include <linux/smp_lock.h> /* cycle_kernel_lock() */ #include <asm/io.h> /* for inb_p, outb_p, inb, outb, etc. */ #include <asm/uaccess.h> /* for get_user, etc. */ |