summaryrefslogtreecommitdiffstats
path: root/drivers/staging/xillybus/xillybus_pcie.c
diff options
context:
space:
mode:
authorEli Billauer2013-07-26 23:24:00 +0200
committerGreg Kroah-Hartman2013-07-27 00:01:49 +0200
commite71042f24129fbe8f1d126721eceaf5ad690c97a (patch)
tree92fbcc7a52103c8f8be38c6b97e57ae3a8aabc58 /drivers/staging/xillybus/xillybus_pcie.c
parentstaging: xillybus: force to be a module (diff)
downloadkernel-qcow2-linux-e71042f24129fbe8f1d126721eceaf5ad690c97a.tar.gz
kernel-qcow2-linux-e71042f24129fbe8f1d126721eceaf5ad690c97a.tar.xz
kernel-qcow2-linux-e71042f24129fbe8f1d126721eceaf5ad690c97a.zip
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>
Diffstat (limited to 'drivers/staging/xillybus/xillybus_pcie.c')
-rw-r--r--drivers/staging/xillybus/xillybus_pcie.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/xillybus/xillybus_pcie.c b/drivers/staging/xillybus/xillybus_pcie.c
index 592f8f7a0b2c..ad45bdb2a715 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)},