diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 15:12:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 15:12:56 -0400 |
| commit | aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec (patch) | |
| tree | 032246a8cc72b934c85e6695bd461848df377548 | |
| parent | af36d7f0df56de3e3e4bbfb15d0915097ecb8cab (diff) | |
[libata sata_nv] NVIDIA ok'd license change from OSL+GPL to GPL
| -rw-r--r-- | drivers/scsi/sata_nv.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c index 1e10370adc34..a61c1509aebb 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c | |||
| @@ -4,21 +4,20 @@ | |||
| 4 | * Copyright 2004 NVIDIA Corp. All rights reserved. | 4 | * Copyright 2004 NVIDIA Corp. All rights reserved. |
| 5 | * Copyright 2004 Andrew Chew | 5 | * Copyright 2004 Andrew Chew |
| 6 | * | 6 | * |
| 7 | * The contents of this file are subject to the Open | ||
| 8 | * Software License version 1.1 that can be found at | ||
| 9 | * http://www.opensource.org/licenses/osl-1.1.txt and is included herein | ||
| 10 | * by reference. | ||
| 11 | * | 7 | * |
| 12 | * Alternatively, the contents of this file may be used under the terms | 8 | * This program is free software; you can redistribute it and/or modify |
| 13 | * of the GNU General Public License version 2 (the "GPL") as distributed | 9 | * it under the terms of the GNU General Public License as published by |
| 14 | * in the kernel source COPYING file, in which case the provisions of | 10 | * the Free Software Foundation; either version 2, or (at your option) |
| 15 | * the GPL are applicable instead of the above. If you wish to allow | 11 | * any later version. |
| 16 | * the use of your version of this file only under the terms of the | 12 | * |
| 17 | * GPL and not to allow others to use your version of this file under | 13 | * This program is distributed in the hope that it will be useful, |
| 18 | * the OSL, indicate your decision by deleting the provisions above and | 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 19 | * replace them with the notice and other provisions required by the GPL. | 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 20 | * If you do not delete the provisions above, a recipient may use your | 16 | * GNU General Public License for more details. |
| 21 | * version of this file under either the OSL or the GPL. | 17 | * |
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with this program; see the file COPYING. If not, write to | ||
| 20 | * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 22 | * | 21 | * |
| 23 | * | 22 | * |
| 24 | * libata documentation is available via 'make {ps|pdf}docs', | 23 | * libata documentation is available via 'make {ps|pdf}docs', |