diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/xen/xenfs/xenbus.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/xen/xenfs/xenbus.c')
| -rw-r--r-- | drivers/xen/xenfs/xenbus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/xenfs/xenbus.c b/drivers/xen/xenfs/xenbus.c index 6c4269b836b7..f28ece397361 100644 --- a/drivers/xen/xenfs/xenbus.c +++ b/drivers/xen/xenfs/xenbus.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 52 | #include <linux/namei.h> | 52 | #include <linux/namei.h> |
| 53 | #include <linux/string.h> | 53 | #include <linux/string.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | 55 | ||
| 55 | #include "xenfs.h" | 56 | #include "xenfs.h" |
| 56 | #include "../xenbus/xenbus_comms.h" | 57 | #include "../xenbus/xenbus_comms.h" |