"dev_changed" is too generic to be global. Put "xenbus_" on the front. Signed-off-by: Jeremy Fitzhardinge --- drivers/xen/xenbus/xenbus_probe.c | 4 ++-- drivers/xen/xenbus/xenbus_probe.h | 2 +- drivers/xen/xenbus/xenbus_probe_backend.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) =================================================================== --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -567,7 +567,7 @@ static int strsep_len(const char *str, c return (len == 0) ? i : -ERANGE; } -void dev_changed(const char *node, struct xen_bus_type *bus) +void xenbus_dev_changed(const char *node, struct xen_bus_type *bus) { int exists, rootlen; struct xenbus_device *dev; @@ -609,7 +609,7 @@ static void frontend_changed(struct xenb { DPRINTK(NULL, ""); - dev_changed(vec[XS_WATCH_PATH], &xenbus_frontend); + xenbus_dev_changed(vec[XS_WATCH_PATH], &xenbus_frontend); } /* We watch for devices appearing and vanishing. */ =================================================================== --- a/drivers/xen/xenbus/xenbus_probe.h +++ b/drivers/xen/xenbus/xenbus_probe.h @@ -67,6 +67,6 @@ extern int xenbus_probe_node(struct xen_ const char *nodename); extern int xenbus_probe_devices(struct xen_bus_type *bus); -extern void dev_changed(const char *node, struct xen_bus_type *bus); +extern void xenbus_dev_changed(const char *node, struct xen_bus_type *bus); #endif =================================================================== --- a/drivers/xen/xenbus/xenbus_probe_backend.c +++ b/drivers/xen/xenbus/xenbus_probe_backend.c @@ -228,7 +228,7 @@ static void backend_changed(struct xenbu { DPRINTK(""); - dev_changed(vec[XS_WATCH_PATH], &xenbus_backend); + xenbus_dev_changed(vec[XS_WATCH_PATH], &xenbus_backend); } static struct xenbus_watch be_watch = { -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/