linux-kernel - [PATCH] staging: xillybus: Multiple definition of xillyname resolved (bug fix)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1374873840-26015-1-git-send-email-eli.billauer@gmail.com>
Date:	Sat, 27 Jul 2013 00:24:00 +0300
From:	Eli Billauer <eli.billauer@...il.com>
To:	gregkh@...uxfoundation.org
Cc:	devel@...verdev.osuosl.org, sfr@...b.auug.org.au,
	linux-kernel@...r.kernel.org, linux-next@...r.kernel.org,
	Eli Billauer <eli.billauer@...il.com>
Subject: [PATCH] staging: xillybus: Multiple definition of xillyname resolved (bug fix)


Signed-off-by: Eli Billauer <eli.billauer@...il.com>
---
 drivers/staging/xillybus/xillybus.h      |    2 --
 drivers/staging/xillybus/xillybus_core.c |    2 ++
 drivers/staging/xillybus/xillybus_of.c   |    2 ++
 drivers/staging/xillybus/xillybus_pcie.c |    2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/xillybus/xillybus.h b/drivers/staging/xillybus/xillybus.h
index c260ebc..b62faeb 100644
--- 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 dd0a71c..7991e57 100644
--- 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 b875376..122d9ba 100644
--- 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 592f8f7..ad45bdb 100644
--- 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)},
-- 
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/