staging: xillybus: Multiple definition of xillyname resolved (bug fix)

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xillybus/xillybus.h b/drivers/staging/xillybus/xillybus.h
index c260ebcc6c4d09f5fc1a638e8e2c1d12b4111433..b62faeb31c532f26bbf9db56b708e91ef358177c 100644 (file)
--- a/drivers/staging/xillybus/xillybus.h
+++ b/drivers/staging/xillybus/xillybus.h
@@ -24,8 +24,6 @@
 #include <linux/list.h>
 #include <linux/workqueue.h>
 
-char xillyname[] = "xillybus";
-
 struct xilly_endpoint_hardware;
 
 struct xilly_page {

diff --git a/drivers/staging/xillybus/xillybus_core.c b/drivers/staging/xillybus/xillybus_core.c
index dd0a71c6b518eb04487bd4b3a683bb31bd5432c9..7991e572ef04b7d3e1460c1ae33d4a83d7e642c9 100644 (file)
--- a/drivers/staging/xillybus/xillybus_core.c
+++ b/drivers/staging/xillybus/xillybus_core.c
@@ -61,6 +61,8 @@ MODULE_LICENSE("GPL v2");
 #define XILLYMSG_OPCODE_FATAL_ERROR 4
 #define XILLYMSG_OPCODE_NONEMPTY 5
 
+static const char xillyname[] = "xillybus";
+
 static struct class *xillybus_class;
 
 /*

diff --git a/drivers/staging/xillybus/xillybus_of.c b/drivers/staging/xillybus/xillybus_of.c
index b875376766a244ee3c86b29a3ff635dd2bb563bd..122d9ba1b28b09d2b2a7d6c6e21ba3c13fb685b5 100644 (file)
--- a/drivers/staging/xillybus/xillybus_of.c
+++ b/drivers/staging/xillybus/xillybus_of.c
@@ -27,6 +27,8 @@ MODULE_VERSION("1.06");
 MODULE_ALIAS("xillybus_of");
 MODULE_LICENSE("GPL v2");
 
+static const char xillyname[] = "xillybus_of";
+
 /* Match table for of_platform binding */
 static struct of_device_id xillybus_of_match[] = {
        { .compatible = "xlnx,xillybus-1.00.a", },

diff --git a/drivers/staging/xillybus/xillybus_pcie.c b/drivers/staging/xillybus/xillybus_pcie.c
index 592f8f7a0b2c701d04536cf15a523dbdfe316e89..ad45bdb2a715a540670c995e6d1779749c35256e 100644 (file)
--- a/drivers/staging/xillybus/xillybus_pcie.c
+++ b/drivers/staging/xillybus/xillybus_pcie.c
@@ -28,6 +28,8 @@ MODULE_LICENSE("GPL v2");
 #define PCI_VENDOR_ID_ACTEL            0x11aa
 #define PCI_VENDOR_ID_LATTICE          0x1204
 
+static const char xillyname[] = "xillybus_pcie";
+
 static DEFINE_PCI_DEVICE_TABLE(xillyids) = {
        {PCI_DEVICE(PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_XILLYBUS)},
        {PCI_DEVICE(PCI_VENDOR_ID_ALTERA, PCI_DEVICE_ID_XILLYBUS)},