Commit e71042f2 authored by Eli Billauer's avatar Eli Billauer Committed by Greg Kroah-Hartman
Browse files

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



Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarEli Billauer <eli.billauer@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6a6621e

drivers/staging/xillybus/xillybus.h

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <linux/list.h>

#include <linux/workqueue.h>



char xillyname[] = "xillybus";



struct xilly_endpoint_hardware;



struct xilly_page {

drivers/staging/xillybus/xillybus_core.c

+2 −0
Original line number Diff line number Diff line
@@ -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;



/*

drivers/staging/xillybus/xillybus_of.c

+2 −0
Original line number Diff line number Diff line
@@ -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", },

drivers/staging/xillybus/xillybus_pcie.c

+2 −0
Original line number Diff line number Diff line
@@ -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)},