diff options
author | Divy Le Ray <divy@chelsio.com> | 2007-01-30 22:44:35 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-05 16:58:51 -0500 |
commit | 1d68e93d65d63814388d1a0b3de028de6dc27ae0 (patch) | |
tree | 9209a0b2d9fd346549d082cfef2418a537b893e0 /drivers/net/cxgb3/cxgb3_main.c | |
parent | a13fbee086310cb99a73958943d4d8103bf52f3a (diff) |
cxgb3 - Add dual licensing
Dual licensing, needed for OFED 1.2
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 7e7ee7ae177b..dfa035a1ad45 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
@@ -1,14 +1,34 @@ | |||
1 | /* | 1 | /* |
2 | * This file is part of the Chelsio T3 Ethernet driver for Linux. | 2 | * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved. |
3 | * | 3 | * |
4 | * Copyright (C) 2003-2006 Chelsio Communications. All rights reserved. | 4 | * This software is available to you under a choice of one of two |
5 | * licenses. You may choose to be licensed under the terms of the GNU | ||
6 | * General Public License (GPL) Version 2, available from the file | ||
7 | * COPYING in the main directory of this source tree, or the | ||
8 | * OpenIB.org BSD license below: | ||
5 | * | 9 | * |
6 | * This program is distributed in the hope that it will be useful, but WITHOUT | 10 | * Redistribution and use in source and binary forms, with or |
7 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | 11 | * without modification, are permitted provided that the following |
8 | * FITNESS FOR A PARTICULAR PURPOSE. See the LICENSE file included in this | 12 | * conditions are met: |
9 | * release for licensing terms and conditions. | 13 | * |
14 | * - Redistributions of source code must retain the above | ||
15 | * copyright notice, this list of conditions and the following | ||
16 | * disclaimer. | ||
17 | * | ||
18 | * - Redistributions in binary form must reproduce the above | ||
19 | * copyright notice, this list of conditions and the following | ||
20 | * disclaimer in the documentation and/or other materials | ||
21 | * provided with the distribution. | ||
22 | * | ||
23 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
24 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
25 | * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
26 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
27 | * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
28 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
29 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
30 | * SOFTWARE. | ||
10 | */ | 31 | */ |
11 | |||
12 | #include <linux/module.h> | 32 | #include <linux/module.h> |
13 | #include <linux/moduleparam.h> | 33 | #include <linux/moduleparam.h> |
14 | #include <linux/init.h> | 34 | #include <linux/init.h> |
@@ -75,7 +95,7 @@ static const struct pci_device_id cxgb3_pci_tbl[] = { | |||
75 | 95 | ||
76 | MODULE_DESCRIPTION(DRV_DESC); | 96 | MODULE_DESCRIPTION(DRV_DESC); |
77 | MODULE_AUTHOR("Chelsio Communications"); | 97 | MODULE_AUTHOR("Chelsio Communications"); |
78 | MODULE_LICENSE("GPL"); | 98 | MODULE_LICENSE("Dual BSD/GPL"); |
79 | MODULE_VERSION(DRV_VERSION); | 99 | MODULE_VERSION(DRV_VERSION); |
80 | MODULE_DEVICE_TABLE(pci, cxgb3_pci_tbl); | 100 | MODULE_DEVICE_TABLE(pci, cxgb3_pci_tbl); |
81 | 101 | ||