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) | |
download | op-kernel-dev-aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec.zip op-kernel-dev-aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec.tar.gz |
[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 1e10370..a61c150 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c @@ -4,21 +4,20 @@ * Copyright 2004 NVIDIA Corp. All rights reserved. * Copyright 2004 Andrew Chew * - * The contents of this file are subject to the Open - * Software License version 1.1 that can be found at - * http://www.opensource.org/licenses/osl-1.1.txt and is included herein - * by reference. * - * Alternatively, the contents of this file may be used under the terms - * of the GNU General Public License version 2 (the "GPL") as distributed - * in the kernel source COPYING file, in which case the provisions of - * the GPL are applicable instead of the above. If you wish to allow - * the use of your version of this file only under the terms of the - * GPL and not to allow others to use your version of this file under - * the OSL, indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by the GPL. - * If you do not delete the provisions above, a recipient may use your - * version of this file under either the OSL or the GPL. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. * * * libata documentation is available via 'make {ps|pdf}docs', |