Stephen Rothwell wrote:
> Hi Gregory,
>
> Today's linux-next build (x86_6 _allmodconfig) failed like this:
>
> drivers/vbus/built-in.o:(.data+0x0): multiple definition of `dev_attr_modalias'
> drivers/xen/built-in.o:(.data+0x46d0): first defined here
>
> Caused by commit 59aa8f441d27c8470764a513dafa46a77f33e953 ("vbus: add
> autoprobe capability to guest"). The DEVICE_ATTR(modalias ...) should
> probably be static. I should probably be static in
> drivers/xen/xenbus/xenbus_probe.c as well.
>
> I have used the version of the alacrity tree from next-20091123 for today.
>
This patch addresses the issue
Signed-off-by: Gregory Haskins <ghaskins@xxxxxxxxxx>
---
drivers/vbus/bus-proxy.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/vbus/bus-proxy.c b/drivers/vbus/bus-proxy.c
index 106e2fe..a318c67 100644
--- a/drivers/vbus/bus-proxy.c
+++ b/drivers/vbus/bus-proxy.c
@@ -115,7 +115,7 @@ static ssize_t _show_modalias(struct device *dev,
{
return sprintf(buf, "vbus-proxy:%s\n", to_dev(dev)->type);
}
-DEVICE_ATTR(modalias, S_IRUSR | S_IRGRP | S_IROTH, _show_modalias, NULL);
+static DEVICE_ATTR(modalias, S_IRUSR | S_IRGRP | S_IROTH, _show_modalias, NULL);
int vbus_device_proxy_register(struct vbus_device_proxy *new)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
