diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 10:38:28 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 10:38:28 +0100 |
commit | 8b6f08eaef16dfcfebc32fa9a017bf70336ad9ec (patch) | |
tree | 9f29f39de67b85baad5eca7d7165549a166c4367 /include | |
parent | serial: sh-sci: build fixes. (diff) | |
parent | sh: Add support for AP-SH4AD-0A board. (diff) | |
download | linux-8b6f08eaef16dfcfebc32fa9a017bf70336ad9ec.tar.xz linux-8b6f08eaef16dfcfebc32fa9a017bf70336ad9ec.zip |
Merge branch 'sh/alphaproject' into sh-latest
Diffstat (limited to 'include')
-rw-r--r-- | include/xen/xenbus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 43e2d7d33976..7a1d15ff19b7 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -94,7 +94,7 @@ struct xenbus_driver { int (*remove)(struct xenbus_device *dev); int (*suspend)(struct xenbus_device *dev, pm_message_t state); int (*resume)(struct xenbus_device *dev); - int (*uevent)(struct xenbus_device *, char **, int, char *, int); + int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *); struct device_driver driver; int (*read_otherend_details)(struct xenbus_device *dev); int (*is_ready)(struct xenbus_device *dev); |