Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 135210
b: refs/heads/master
c: ff4fbd4
h: refs/heads/master
v: v3
  • Loading branch information
Dhananjay Phadke authored and David S. Miller committed Mar 14, 2009
1 parent 2566d0a commit fe9895e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d8b100c5da003b6f8c410453e1e6e74ced8d1cc1
refs/heads/master: ff4fbd43fe82de28710761f2cc2ed122d716483a
4 changes: 2 additions & 2 deletions trunk/drivers/net/netxen/netxen_nic.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@

#define _NETXEN_NIC_LINUX_MAJOR 4
#define _NETXEN_NIC_LINUX_MINOR 0
#define _NETXEN_NIC_LINUX_SUBVERSION 11
#define NETXEN_NIC_LINUX_VERSIONID "4.0.11"
#define _NETXEN_NIC_LINUX_SUBVERSION 30
#define NETXEN_NIC_LINUX_VERSIONID "4.0.30"

#define NETXEN_VERSION_CODE(a, b, c) (((a) << 16) + ((b) << 8) + (c))

Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/net/netxen/netxen_nic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -910,9 +910,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
int pci_func_id = PCI_FUNC(pdev->devfn);
uint8_t revision_id;

if (pci_func_id == 0)
printk(KERN_INFO "%s\n", netxen_nic_driver_string);

if (pdev->class != 0x020000) {
printk(KERN_DEBUG "NetXen function %d, class %x will not "
"be enabled.\n",pci_func_id, pdev->class);
Expand Down Expand Up @@ -1750,6 +1747,8 @@ static struct pci_driver netxen_driver = {

static int __init netxen_init_module(void)
{
printk(KERN_INFO "%s\n", netxen_nic_driver_string);

if ((netxen_workq = create_singlethread_workqueue("netxen")) == NULL)
return -ENOMEM;

Expand Down

0 comments on commit fe9895e

Please sign in to comment.