diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /include/xen/xenbus.h | |
| parent | 889c92d21db40be0b7d22a59395060237895bb85 (diff) | |
| parent | 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 (diff) | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'include/xen/xenbus.h')
| -rw-r--r-- | include/xen/xenbus.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 6369d89c25d5..f87f9614844d 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h | |||
| @@ -136,8 +136,6 @@ struct xenbus_transaction | |||
| 136 | /* Nil transaction ID. */ | 136 | /* Nil transaction ID. */ |
| 137 | #define XBT_NIL ((struct xenbus_transaction) { 0 }) | 137 | #define XBT_NIL ((struct xenbus_transaction) { 0 }) |
| 138 | 138 | ||
| 139 | int __init xenbus_dev_init(void); | ||
| 140 | |||
| 141 | char **xenbus_directory(struct xenbus_transaction t, | 139 | char **xenbus_directory(struct xenbus_transaction t, |
| 142 | const char *dir, const char *node, unsigned int *num); | 140 | const char *dir, const char *node, unsigned int *num); |
| 143 | void *xenbus_read(struct xenbus_transaction t, | 141 | void *xenbus_read(struct xenbus_transaction t, |