diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 01:34:53 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 01:34:53 -0400 |
| commit | 38a4671cad3f0d277cf48445b49e42a475ebfb6a (patch) | |
| tree | 7348f3dd5f4e1bec39758dcff748a9dcbbf3430c /drivers/xen/xenbus/xenbus_comms.h | |
| parent | d652f7022b359afd5d34fc9fffd71df118521ead (diff) | |
| parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
Merge 3.10-rc5 into char-misc-next
Diffstat (limited to 'drivers/xen/xenbus/xenbus_comms.h')
| -rw-r--r-- | drivers/xen/xenbus/xenbus_comms.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/xenbus/xenbus_comms.h b/drivers/xen/xenbus/xenbus_comms.h index c8abd3b8a6c4..e74f9c1fbd80 100644 --- a/drivers/xen/xenbus/xenbus_comms.h +++ b/drivers/xen/xenbus/xenbus_comms.h | |||
| @@ -45,6 +45,7 @@ int xb_wait_for_data_to_read(void); | |||
| 45 | int xs_input_avail(void); | 45 | int xs_input_avail(void); |
| 46 | extern struct xenstore_domain_interface *xen_store_interface; | 46 | extern struct xenstore_domain_interface *xen_store_interface; |
| 47 | extern int xen_store_evtchn; | 47 | extern int xen_store_evtchn; |
| 48 | extern enum xenstore_init xen_store_domain_type; | ||
| 48 | 49 | ||
| 49 | extern const struct file_operations xen_xenbus_fops; | 50 | extern const struct file_operations xen_xenbus_fops; |
| 50 | 51 | ||