diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/s2io-regs.h | 2 | ||||
-rw-r--r-- | drivers/net/s2io.c | 4 | ||||
-rw-r--r-- | drivers/net/s2io.h | 2 | ||||
-rw-r--r-- | drivers/net/vxge/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-config.c | 4 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-config.h | 4 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-ethtool.c | 4 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-ethtool.h | 4 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-main.c | 6 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-main.h | 4 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-reg.h | 4 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-traffic.c | 4 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-traffic.h | 4 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-version.h | 4 |
14 files changed, 26 insertions, 26 deletions
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h index 416669fd68c6..3688325c11f5 100644 --- a/drivers/net/s2io-regs.h +++ b/drivers/net/s2io-regs.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /************************************************************************ | 1 | /************************************************************************ |
2 | * regs.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC | 2 | * regs.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC |
3 | * Copyright(c) 2002-2007 Neterion Inc. | 3 | * Copyright(c) 2002-2010 Exar Corp. |
4 | 4 | ||
5 | * This software may be used and distributed according to the terms of | 5 | * This software may be used and distributed according to the terms of |
6 | * the GNU General Public License (GPL), incorporated herein by reference. | 6 | * the GNU General Public License (GPL), incorporated herein by reference. |
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index d0af924ddd67..f9f9ed8a8138 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /************************************************************************ | 1 | /************************************************************************ |
2 | * s2io.c: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC | 2 | * s2io.c: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC |
3 | * Copyright(c) 2002-2007 Neterion Inc. | 3 | * Copyright(c) 2002-2010 Exar Corp. |
4 | * | 4 | * |
5 | * This software may be used and distributed according to the terms of | 5 | * This software may be used and distributed according to the terms of |
6 | * the GNU General Public License (GPL), incorporated herein by reference. | 6 | * the GNU General Public License (GPL), incorporated herein by reference. |
@@ -8199,7 +8199,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) | |||
8199 | goto register_failed; | 8199 | goto register_failed; |
8200 | } | 8200 | } |
8201 | s2io_vpd_read(sp); | 8201 | s2io_vpd_read(sp); |
8202 | DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2007 Neterion Inc.\n"); | 8202 | DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2010 Exar Corp.\n"); |
8203 | DBG_PRINT(ERR_DBG, "%s: Neterion %s (rev %d)\n", dev->name, | 8203 | DBG_PRINT(ERR_DBG, "%s: Neterion %s (rev %d)\n", dev->name, |
8204 | sp->product_name, pdev->revision); | 8204 | sp->product_name, pdev->revision); |
8205 | DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name, | 8205 | DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name, |
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 5e52c75892df..3645fb3673db 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /************************************************************************ | 1 | /************************************************************************ |
2 | * s2io.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC | 2 | * s2io.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC |
3 | * Copyright(c) 2002-2007 Neterion Inc. | 3 | * Copyright(c) 2002-2010 Exar Corp. |
4 | 4 | ||
5 | * This software may be used and distributed according to the terms of | 5 | * This software may be used and distributed according to the terms of |
6 | * the GNU General Public License (GPL), incorporated herein by reference. | 6 | * the GNU General Public License (GPL), incorporated herein by reference. |
diff --git a/drivers/net/vxge/Makefile b/drivers/net/vxge/Makefile index 8992ca26b277..b625e2c503f5 100644 --- a/drivers/net/vxge/Makefile +++ b/drivers/net/vxge/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # Makefile for Neterion Inc's X3100 Series 10 GbE PCIe # I/O | 2 | # Makefile for Exar Corp's X3100 Series 10 GbE PCIe I/O |
3 | # Virtualized Server Adapter linux driver | 3 | # Virtualized Server Adapter linux driver |
4 | 4 | ||
5 | obj-$(CONFIG_VXGE) += vxge.o | 5 | obj-$(CONFIG_VXGE) += vxge.o |
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c index 297f0d202073..0e6db5935609 100644 --- a/drivers/net/vxge/vxge-config.c +++ b/drivers/net/vxge/vxge-config.c | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-config.c: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O | 10 | * vxge-config.c: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O |
11 | * Virtualized Server Adapter. | 11 | * Virtualized Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #include <linux/vmalloc.h> | 14 | #include <linux/vmalloc.h> |
15 | #include <linux/etherdevice.h> | 15 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h index 4ae2625d4d8f..1a94343023cb 100644 --- a/drivers/net/vxge/vxge-config.h +++ b/drivers/net/vxge/vxge-config.h | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-config.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O | 10 | * vxge-config.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O |
11 | * Virtualized Server Adapter. | 11 | * Virtualized Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #ifndef VXGE_CONFIG_H | 14 | #ifndef VXGE_CONFIG_H |
15 | #define VXGE_CONFIG_H | 15 | #define VXGE_CONFIG_H |
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/vxge/vxge-ethtool.c index cadef8549c06..05679e306fdd 100644 --- a/drivers/net/vxge/vxge-ethtool.c +++ b/drivers/net/vxge/vxge-ethtool.c | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-ethtool.c: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O | 10 | * vxge-ethtool.c: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O |
11 | * Virtualized Server Adapter. | 11 | * Virtualized Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #include<linux/ethtool.h> | 14 | #include<linux/ethtool.h> |
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
diff --git a/drivers/net/vxge/vxge-ethtool.h b/drivers/net/vxge/vxge-ethtool.h index 1c3df0a34acc..6cf3044d7f43 100644 --- a/drivers/net/vxge/vxge-ethtool.h +++ b/drivers/net/vxge/vxge-ethtool.h | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-ethtool.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O | 10 | * vxge-ethtool.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O |
11 | * Virtualized Server Adapter. | 11 | * Virtualized Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #ifndef _VXGE_ETHTOOL_H | 14 | #ifndef _VXGE_ETHTOOL_H |
15 | #define _VXGE_ETHTOOL_H | 15 | #define _VXGE_ETHTOOL_H |
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index 48f17321a663..94d87e80abcd 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-main.c: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O | 10 | * vxge-main.c: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O |
11 | * Virtualized Server Adapter. | 11 | * Virtualized Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | * | 13 | * |
14 | * The module loadable parameters that are supported by the driver and a brief | 14 | * The module loadable parameters that are supported by the driver and a brief |
15 | * explanation of all the variables: | 15 | * explanation of all the variables: |
@@ -4433,7 +4433,7 @@ vxge_starter(void) | |||
4433 | char version[32]; | 4433 | char version[32]; |
4434 | snprintf(version, 32, "%s", DRV_VERSION); | 4434 | snprintf(version, 32, "%s", DRV_VERSION); |
4435 | 4435 | ||
4436 | printk(KERN_INFO "%s: Copyright(c) 2002-2009 Neterion Inc\n", | 4436 | printk(KERN_INFO "%s: Copyright(c) 2002-2010 Exar Corp.\n", |
4437 | VXGE_DRIVER_NAME); | 4437 | VXGE_DRIVER_NAME); |
4438 | printk(KERN_INFO "%s: Driver version: %s\n", | 4438 | printk(KERN_INFO "%s: Driver version: %s\n", |
4439 | VXGE_DRIVER_NAME, version); | 4439 | VXGE_DRIVER_NAME, version); |
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h index 5982396787fc..2e3b064b8e4b 100644 --- a/drivers/net/vxge/vxge-main.h +++ b/drivers/net/vxge/vxge-main.h | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-main.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O | 10 | * vxge-main.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O |
11 | * Virtualized Server Adapter. | 11 | * Virtualized Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #ifndef VXGE_MAIN_H | 14 | #ifndef VXGE_MAIN_H |
15 | #define VXGE_MAIN_H | 15 | #define VXGE_MAIN_H |
diff --git a/drivers/net/vxge/vxge-reg.h b/drivers/net/vxge/vxge-reg.h index 9a0cf8eaa328..3dd5c9615ef9 100644 --- a/drivers/net/vxge/vxge-reg.h +++ b/drivers/net/vxge/vxge-reg.h | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-reg.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O Virtualized | 10 | * vxge-reg.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O Virtualized |
11 | * Server Adapter. | 11 | * Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #ifndef VXGE_REG_H | 14 | #ifndef VXGE_REG_H |
15 | #define VXGE_REG_H | 15 | #define VXGE_REG_H |
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c index 1a7078304adf..cedf08f99cb3 100644 --- a/drivers/net/vxge/vxge-traffic.c +++ b/drivers/net/vxge/vxge-traffic.c | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-traffic.c: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O | 10 | * vxge-traffic.c: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O |
11 | * Virtualized Server Adapter. | 11 | * Virtualized Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #include <linux/etherdevice.h> | 14 | #include <linux/etherdevice.h> |
15 | 15 | ||
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h index c252f3d3f650..6fa07d13798e 100644 --- a/drivers/net/vxge/vxge-traffic.h +++ b/drivers/net/vxge/vxge-traffic.h | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-traffic.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O | 10 | * vxge-traffic.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O |
11 | * Virtualized Server Adapter. | 11 | * Virtualized Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #ifndef VXGE_TRAFFIC_H | 14 | #ifndef VXGE_TRAFFIC_H |
15 | #define VXGE_TRAFFIC_H | 15 | #define VXGE_TRAFFIC_H |
diff --git a/drivers/net/vxge/vxge-version.h b/drivers/net/vxge/vxge-version.h index 5da7ab1fd307..4008e6b5d525 100644 --- a/drivers/net/vxge/vxge-version.h +++ b/drivers/net/vxge/vxge-version.h | |||
@@ -7,9 +7,9 @@ | |||
7 | * system is licensed under the GPL. | 7 | * system is licensed under the GPL. |
8 | * See the file COPYING in this distribution for more information. | 8 | * See the file COPYING in this distribution for more information. |
9 | * | 9 | * |
10 | * vxge-version.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O | 10 | * vxge-version.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O |
11 | * Virtualized Server Adapter. | 11 | * Virtualized Server Adapter. |
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2010 Exar Corp. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #ifndef VXGE_VERSION_H | 14 | #ifndef VXGE_VERSION_H |
15 | 15 | ||