diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 17:20:06 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 17:20:06 +0400 |
| commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
| tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /drivers/xen/xencomm.c | |
| parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
| parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
| download | linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.xz | |
Merge remote branch 'alsa/devel' into topic/misc
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 @@ * Authors: Hollis Blanchard <hollisb@us.ibm.com> */ -#include <linux/gfp.h> #include <linux/mm.h> +#include <linux/slab.h> #include <asm/page.h> #include <xen/xencomm.h> #include <xen/interface/xen.h> |