Skip to content

L
linux
Commit 6d87fb78 authored by Christopher Goldfarb's avatar Christopher Goldfarb Committed by Jeff Garzik
Browse files
Options

e1000 net drvr update 1/13: 

License update, the "GNU General Public License" was incorrectly
referred to as the "GNU Public License".
parent f9ff0abb
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 49 deletions
drivers/net/e1000/LICENSE
View file @ 6d87fb78
This software program is available to you under a choice of one of two This software program is available to you under a choice of one of two
licenses. You may choose to be licensed under either the GNU General Public licenses. You may choose to be licensed under either the GNU General Public
License (GPL) Version 2, June 1991, available at License 2.0, June 1991, available at http://www.fsf.org/copyleft/gpl.html,
http://www.fsf.org/copyleft/gpl.html, or the Intel BSD + Patent License, the or the Intel BSD + Patent License, the text of which follows:
text of which follows:
Recipient has requested a license and Intel Corporation ("Intel") is willing Recipient has requested a license and Intel Corporation ("Intel") is willing
to grant a license for the software entitled Linux Base Driver for the to grant a license for the software entitled Linux Base Driver for the
...@@ -16,7 +15,7 @@ combined with the operating system referred to below. ...@@ -16,7 +15,7 @@ combined with the operating system referred to below.
"Recipient" means the party to whom Intel delivers this Software. "Recipient" means the party to whom Intel delivers this Software.
"Licensee" means Recipient and those third parties that receive a license to "Licensee" means Recipient and those third parties that receive a license to
any operating system available under the GNU Public License version 2.0 or any operating system available under the GNU General Public License 2.0 or
later. later.
Copyright (c) 1999 - 2002 Intel Corporation. Copyright (c) 1999 - 2002 Intel Corporation.
...@@ -49,10 +48,10 @@ not add functionality or features when the Software is incorporated in any ...@@ -49,10 +48,10 @@ not add functionality or features when the Software is incorporated in any
version of an operating system that has been distributed under the GNU version of an operating system that has been distributed under the GNU
General Public License 2.0 or later. This patent license shall apply to the General Public License 2.0 or later. This patent license shall apply to the
combination of the Software and any operating system licensed under the GNU combination of the Software and any operating system licensed under the GNU
Public License version 2.0 or later if, at the time Intel provides the General Public License 2.0 or later if, at the time Intel provides the
Software to Recipient, such addition of the Software to the then publicly Software to Recipient, such addition of the Software to the then publicly
available versions of such operating systems available under the GNU Public available versions of such operating systems available under the GNU General
License version 2.0 or later (whether in gold, beta or alpha form) causes Public License 2.0 or later (whether in gold, beta or alpha form) causes
such combination to be covered by the Licensed Patents. The patent license such combination to be covered by the Licensed Patents. The patent license
shall not apply to any other combinations which include the Software. NO shall not apply to any other combinations which include the Software. NO
hardware per se is licensed hereunder. hardware per se is licensed hereunder.
......
drivers/net/e1000/e1000.h
View file @ 6d87fb78
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
This software program is available to you under a choice of one of two This software program is available to you under a choice of one of two
licenses. You may choose to be licensed under either the GNU General Public licenses. You may choose to be licensed under either the GNU General Public
License (GPL) Version 2, June 1991, available at License 2.0, June 1991, available at http://www.fsf.org/copyleft/gpl.html,
http://www.fsf.org/copyleft/gpl.html, or the Intel BSD + Patent License, the or the Intel BSD + Patent License, the text of which follows:
text of which follows:
Recipient has requested a license and Intel Corporation ("Intel") is willing Recipient has requested a license and Intel Corporation ("Intel") is willing
to grant a license for the software entitled Linux Base Driver for the to grant a license for the software entitled Linux Base Driver for the
...@@ -18,7 +17,7 @@ ...@@ -18,7 +17,7 @@
"Recipient" means the party to whom Intel delivers this Software. "Recipient" means the party to whom Intel delivers this Software.
"Licensee" means Recipient and those third parties that receive a license to "Licensee" means Recipient and those third parties that receive a license to
any operating system available under the GNU Public License version 2.0 or any operating system available under the GNU General Public License 2.0 or
later. later.
Copyright (c) 1999 - 2002 Intel Corporation. Copyright (c) 1999 - 2002 Intel Corporation.
...@@ -51,10 +50,10 @@ ...@@ -51,10 +50,10 @@
version of an operating system that has been distributed under the GNU version of an operating system that has been distributed under the GNU
General Public License 2.0 or later. This patent license shall apply to the General Public License 2.0 or later. This patent license shall apply to the
combination of the Software and any operating system licensed under the GNU combination of the Software and any operating system licensed under the GNU
Public License version 2.0 or later if, at the time Intel provides the General Public License 2.0 or later if, at the time Intel provides the
Software to Recipient, such addition of the Software to the then publicly Software to Recipient, such addition of the Software to the then publicly
available versions of such operating systems available under the GNU Public available versions of such operating systems available under the GNU General
License version 2.0 or later (whether in gold, beta or alpha form) causes Public License 2.0 or later (whether in gold, beta or alpha form) causes
such combination to be covered by the Licensed Patents. The patent license such combination to be covered by the Licensed Patents. The patent license
shall not apply to any other combinations which include the Software. NO shall not apply to any other combinations which include the Software. NO
hardware per se is licensed hereunder. hardware per se is licensed hereunder.
......
drivers/net/e1000/e1000_ethtool.c
View file @ 6d87fb78
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
This software program is available to you under a choice of one of two This software program is available to you under a choice of one of two
licenses. You may choose to be licensed under either the GNU General Public licenses. You may choose to be licensed under either the GNU General Public
License (GPL) Version 2, June 1991, available at License 2.0, June 1991, available at http://www.fsf.org/copyleft/gpl.html,
http://www.fsf.org/copyleft/gpl.html, or the Intel BSD + Patent License, the or the Intel BSD + Patent License, the text of which follows:
text of which follows:
Recipient has requested a license and Intel Corporation ("Intel") is willing Recipient has requested a license and Intel Corporation ("Intel") is willing
to grant a license for the software entitled Linux Base Driver for the to grant a license for the software entitled Linux Base Driver for the
...@@ -18,7 +17,7 @@ ...@@ -18,7 +17,7 @@
"Recipient" means the party to whom Intel delivers this Software. "Recipient" means the party to whom Intel delivers this Software.
"Licensee" means Recipient and those third parties that receive a license to "Licensee" means Recipient and those third parties that receive a license to
any operating system available under the GNU Public License version 2.0 or any operating system available under the GNU General Public License 2.0 or
later. later.
Copyright (c) 1999 - 2002 Intel Corporation. Copyright (c) 1999 - 2002 Intel Corporation.
...@@ -51,10 +50,10 @@ ...@@ -51,10 +50,10 @@
version of an operating system that has been distributed under the GNU version of an operating system that has been distributed under the GNU
General Public License 2.0 or later. This patent license shall apply to the General Public License 2.0 or later. This patent license shall apply to the
combination of the Software and any operating system licensed under the GNU combination of the Software and any operating system licensed under the GNU
Public License version 2.0 or later if, at the time Intel provides the General Public License 2.0 or later if, at the time Intel provides the
Software to Recipient, such addition of the Software to the then publicly Software to Recipient, such addition of the Software to the then publicly
available versions of such operating systems available under the GNU Public available versions of such operating systems available under the GNU General
License version 2.0 or later (whether in gold, beta or alpha form) causes Public License 2.0 or later (whether in gold, beta or alpha form) causes
such combination to be covered by the Licensed Patents. The patent license such combination to be covered by the Licensed Patents. The patent license
shall not apply to any other combinations which include the Software. NO shall not apply to any other combinations which include the Software. NO
hardware per se is licensed hereunder. hardware per se is licensed hereunder.
......
drivers/net/e1000/e1000_main.c
View file @ 6d87fb78
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
This software program is available to you under a choice of one of two This software program is available to you under a choice of one of two
licenses. You may choose to be licensed under either the GNU General Public licenses. You may choose to be licensed under either the GNU General Public
License (GPL) Version 2, June 1991, available at License 2.0, June 1991, available at http://www.fsf.org/copyleft/gpl.html,
http://www.fsf.org/copyleft/gpl.html, or the Intel BSD + Patent License, the or the Intel BSD + Patent License, the text of which follows:
text of which follows:
Recipient has requested a license and Intel Corporation ("Intel") is willing Recipient has requested a license and Intel Corporation ("Intel") is willing
to grant a license for the software entitled Linux Base Driver for the to grant a license for the software entitled Linux Base Driver for the
...@@ -18,7 +17,7 @@ ...@@ -18,7 +17,7 @@
"Recipient" means the party to whom Intel delivers this Software. "Recipient" means the party to whom Intel delivers this Software.
"Licensee" means Recipient and those third parties that receive a license to "Licensee" means Recipient and those third parties that receive a license to
any operating system available under the GNU Public License version 2.0 or any operating system available under the GNU General Public License 2.0 or
later. later.
Copyright (c) 1999 - 2002 Intel Corporation. Copyright (c) 1999 - 2002 Intel Corporation.
...@@ -51,10 +50,10 @@ ...@@ -51,10 +50,10 @@
version of an operating system that has been distributed under the GNU version of an operating system that has been distributed under the GNU
General Public License 2.0 or later. This patent license shall apply to the General Public License 2.0 or later. This patent license shall apply to the
combination of the Software and any operating system licensed under the GNU combination of the Software and any operating system licensed under the GNU
Public License version 2.0 or later if, at the time Intel provides the General Public License 2.0 or later if, at the time Intel provides the
Software to Recipient, such addition of the Software to the then publicly Software to Recipient, such addition of the Software to the then publicly
available versions of such operating systems available under the GNU Public available versions of such operating systems available under the GNU General
License version 2.0 or later (whether in gold, beta or alpha form) causes Public License 2.0 or later (whether in gold, beta or alpha form) causes
such combination to be covered by the Licensed Patents. The patent license such combination to be covered by the Licensed Patents. The patent license
shall not apply to any other combinations which include the Software. NO shall not apply to any other combinations which include the Software. NO
hardware per se is licensed hereunder. hardware per se is licensed hereunder.
......
drivers/net/e1000/e1000_osdep.h
View file @ 6d87fb78
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
This software program is available to you under a choice of one of two This software program is available to you under a choice of one of two
licenses. You may choose to be licensed under either the GNU General Public licenses. You may choose to be licensed under either the GNU General Public
License (GPL) Version 2, June 1991, available at License 2.0, June 1991, available at http://www.fsf.org/copyleft/gpl.html,
http://www.fsf.org/copyleft/gpl.html, or the Intel BSD + Patent License, the or the Intel BSD + Patent License, the text of which follows:
text of which follows:
Recipient has requested a license and Intel Corporation ("Intel") is willing Recipient has requested a license and Intel Corporation ("Intel") is willing
to grant a license for the software entitled Linux Base Driver for the to grant a license for the software entitled Linux Base Driver for the
...@@ -18,7 +17,7 @@ ...@@ -18,7 +17,7 @@
"Recipient" means the party to whom Intel delivers this Software. "Recipient" means the party to whom Intel delivers this Software.
"Licensee" means Recipient and those third parties that receive a license to "Licensee" means Recipient and those third parties that receive a license to
any operating system available under the GNU Public License version 2.0 or any operating system available under the GNU General Public License 2.0 or
later. later.
Copyright (c) 1999 - 2002 Intel Corporation. Copyright (c) 1999 - 2002 Intel Corporation.
...@@ -51,10 +50,10 @@ ...@@ -51,10 +50,10 @@
version of an operating system that has been distributed under the GNU version of an operating system that has been distributed under the GNU
General Public License 2.0 or later. This patent license shall apply to the General Public License 2.0 or later. This patent license shall apply to the
combination of the Software and any operating system licensed under the GNU combination of the Software and any operating system licensed under the GNU
Public License version 2.0 or later if, at the time Intel provides the General Public License 2.0 or later if, at the time Intel provides the
Software to Recipient, such addition of the Software to the then publicly Software to Recipient, such addition of the Software to the then publicly
available versions of such operating systems available under the GNU Public available versions of such operating systems available under the GNU General
License version 2.0 or later (whether in gold, beta or alpha form) causes Public License 2.0 or later (whether in gold, beta or alpha form) causes
such combination to be covered by the Licensed Patents. The patent license such combination to be covered by the Licensed Patents. The patent license
shall not apply to any other combinations which include the Software. NO shall not apply to any other combinations which include the Software. NO
hardware per se is licensed hereunder. hardware per se is licensed hereunder.
......
drivers/net/e1000/e1000_param.c
View file @ 6d87fb78
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
This software program is available to you under a choice of one of two This software program is available to you under a choice of one of two
licenses. You may choose to be licensed under either the GNU General Public licenses. You may choose to be licensed under either the GNU General Public
License (GPL) Version 2, June 1991, available at License 2.0, June 1991, available at http://www.fsf.org/copyleft/gpl.html,
http://www.fsf.org/copyleft/gpl.html, or the Intel BSD + Patent License, the or the Intel BSD + Patent License, the text of which follows:
text of which follows:
Recipient has requested a license and Intel Corporation ("Intel") is willing Recipient has requested a license and Intel Corporation ("Intel") is willing
to grant a license for the software entitled Linux Base Driver for the to grant a license for the software entitled Linux Base Driver for the
...@@ -18,7 +17,7 @@ ...@@ -18,7 +17,7 @@
"Recipient" means the party to whom Intel delivers this Software. "Recipient" means the party to whom Intel delivers this Software.
"Licensee" means Recipient and those third parties that receive a license to "Licensee" means Recipient and those third parties that receive a license to
any operating system available under the GNU Public License version 2.0 or any operating system available under the GNU General Public License 2.0 or
later. later.
Copyright (c) 1999 - 2002 Intel Corporation. Copyright (c) 1999 - 2002 Intel Corporation.
...@@ -51,10 +50,10 @@ ...@@ -51,10 +50,10 @@
version of an operating system that has been distributed under the GNU version of an operating system that has been distributed under the GNU
General Public License 2.0 or later. This patent license shall apply to the General Public License 2.0 or later. This patent license shall apply to the
combination of the Software and any operating system licensed under the GNU combination of the Software and any operating system licensed under the GNU
Public License version 2.0 or later if, at the time Intel provides the General Public License 2.0 or later if, at the time Intel provides the
Software to Recipient, such addition of the Software to the then publicly Software to Recipient, such addition of the Software to the then publicly
available versions of such operating systems available under the GNU Public available versions of such operating systems available under the GNU General
License version 2.0 or later (whether in gold, beta or alpha form) causes Public License 2.0 or later (whether in gold, beta or alpha form) causes
such combination to be covered by the Licensed Patents. The patent license such combination to be covered by the Licensed Patents. The patent license
shall not apply to any other combinations which include the Software. NO shall not apply to any other combinations which include the Software. NO
hardware per se is licensed hereunder. hardware per se is licensed hereunder.
......
drivers/net/e1000/e1000_proc.c
View file @ 6d87fb78
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
This software program is available to you under a choice of one of two This software program is available to you under a choice of one of two
licenses. You may choose to be licensed under either the GNU General Public licenses. You may choose to be licensed under either the GNU General Public
License (GPL) Version 2, June 1991, available at License 2.0, June 1991, available at http://www.fsf.org/copyleft/gpl.html,
http://www.fsf.org/copyleft/gpl.html, or the Intel BSD + Patent License, the or the Intel BSD + Patent License, the text of which follows:
text of which follows:
Recipient has requested a license and Intel Corporation ("Intel") is willing Recipient has requested a license and Intel Corporation ("Intel") is willing
to grant a license for the software entitled Linux Base Driver for the to grant a license for the software entitled Linux Base Driver for the
...@@ -18,7 +17,7 @@ ...@@ -18,7 +17,7 @@
"Recipient" means the party to whom Intel delivers this Software. "Recipient" means the party to whom Intel delivers this Software.
"Licensee" means Recipient and those third parties that receive a license to "Licensee" means Recipient and those third parties that receive a license to
any operating system available under the GNU Public License version 2.0 or any operating system available under the GNU General Public License 2.0 or
later. later.
Copyright (c) 1999 - 2002 Intel Corporation. Copyright (c) 1999 - 2002 Intel Corporation.
...@@ -51,10 +50,10 @@ ...@@ -51,10 +50,10 @@
version of an operating system that has been distributed under the GNU version of an operating system that has been distributed under the GNU
General Public License 2.0 or later. This patent license shall apply to the General Public License 2.0 or later. This patent license shall apply to the
combination of the Software and any operating system licensed under the GNU combination of the Software and any operating system licensed under the GNU
Public License version 2.0 or later if, at the time Intel provides the General Public License 2.0 or later if, at the time Intel provides the
Software to Recipient, such addition of the Software to the then publicly Software to Recipient, such addition of the Software to the then publicly
available versions of such operating systems available under the GNU Public available versions of such operating systems available under the GNU General
License version 2.0 or later (whether in gold, beta or alpha form) causes Public License 2.0 or later (whether in gold, beta or alpha form) causes
such combination to be covered by the Licensed Patents. The patent license such combination to be covered by the Licensed Patents. The patent license
shall not apply to any other combinations which include the Software. NO shall not apply to any other combinations which include the Software. NO
hardware per se is licensed hereunder. hardware per se is licensed hereunder.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7