diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/xen/xencomm.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/xen/xencomm.c')
| -rw-r--r-- | drivers/xen/xencomm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xencomm.c b/drivers/xen/xencomm.c index a240b2c20b99..b91f8ff50d05 100644 --- a/drivers/xen/xencomm.c +++ b/drivers/xen/xencomm.c | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | * Authors: Hollis Blanchard <hollisb@us.ibm.com> | 18 | * Authors: Hollis Blanchard <hollisb@us.ibm.com> |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/gfp.h> | ||
| 22 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <asm/page.h> | 23 | #include <asm/page.h> |
| 24 | #include <xen/xencomm.h> | 24 | #include <xen/xencomm.h> |
| 25 | #include <xen/interface/xen.h> | 25 | #include <xen/interface/xen.h> |