diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 23:59:58 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 23:59:58 +0200 |
| commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
| tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /block/ioctl.c | |
| parent | x86: Clean up the hypervisor layer (diff) | |
| parent | Linux 2.6.34-rc6 (diff) | |
| download | linux-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz linux-d7be0ce6afb1df60bc786f57410407ceae92b994.zip | |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'block/ioctl.c')
| -rw-r--r-- | block/ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index be48ea51faee..8905d2a2a717 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -1,5 +1,6 @@ #include <linux/capability.h> #include <linux/blkdev.h> +#include <linux/gfp.h> #include <linux/blkpg.h> #include <linux/hdreg.h> #include <linux/backing-dev.h> |