Module: xenomai-3
Branch: stable-3.0.x
Commit: 5b616b6020fea59a54143988b85aa612d4f4ffc3
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=5b616b6020fea59a54143988b85aa612d4f4ffc3
Author: Greg Gallagher <g...@embeddedgreg.com>
Date: Sat Dec 9 04:50:00 2017 +0100
net/drivers: e1000: Fix up name collision, debug is already defined
---
kernel/drivers/net/drivers/experimental/e1000/e1000_main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
b/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
index 66ecfce..acdc13c 100644
--- a/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
+++ b/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
@@ -421,9 +421,9 @@ module_param_array(cards, int, NULL, 0444);
MODULE_PARM_DESC(cards, "array of cards to be supported (eg. 1,0,1)");
-static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+static int local_debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
+module_param(local_debug, int, 0);
+MODULE_PARM_DESC(local_debug, "Debug level (0=none,...,16=all)");
/* The parameter 'pciif' might be used to use this driver for
* PCI or PCIe only NICs.
@@ -1096,7 +1096,7 @@ static int e1000_probe(struct pci_dev *pdev,
adapter->netdev = netdev;
adapter->pdev = pdev;
adapter->hw.back = adapter;
- adapter->msg_enable = (1 << debug) - 1;
+ adapter->msg_enable = (1 << local_debug) - 1;
err = -EIO;
adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, BAR_0),
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
