From: Greg Gallagher Date: Fri, 8 Dec 2017 22:50:35 -0500 Message-Id: <1512791435-4231-1-git-send-email-greg@embeddedgreg.com> Subject: [Xenomai] [PATCH] Fix up name collision, debug is already defined List-Id: Discussions about the Xenomai project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: xenomai@xenomai.org --- When compiling for x86 and enabling experimental intel net drivers I ran into a compilation error where debug was defined previously. Rename the debug variable to avoid the collision. --- 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), -- 2.7.4