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>
This commit is contained in:
parent
f6a6621e54
commit
e71042f241
|
@ -24,8 +24,6 @@
|
|||
#include <linux/list.h>
|
||||
#include <linux/workqueue.h>
|
||||
|
||||
char xillyname[] = "xillybus";
|
||||
|
||||
struct xilly_endpoint_hardware;
|
||||
|
||||
struct xilly_page {
|
||||
|
|
|
@ -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;
|
||||
|
||||
/*
|
||||
|
|
|
@ -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", },
|
||||
|
|
|
@ -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)},
|
||||
|
|
Loading…
Reference in New Issue