diff options
| author | ganbold <ganbold@FreeBSD.org> | 2013-01-15 09:56:20 +0000 |
|---|---|---|
| committer | ganbold <ganbold@FreeBSD.org> | 2013-01-15 09:56:20 +0000 |
| commit | 471c9101902d5b1e568f0d0b7ff13ac470cd8495 (patch) | |
| tree | 13d0ee4a086da050752f9b119d15c0d43f77c02d /sys/arm/allwinner | |
| parent | 29c90575f99d95e0e049f9bd8fd378e8695fb683 (diff) | |
| download | FreeBSD-src-471c9101902d5b1e568f0d0b7ff13ac470cd8495.zip FreeBSD-src-471c9101902d5b1e568f0d0b7ff13ac470cd8495.tar.gz | |
Add mistakenly removed third clause to license
Reviewed by: joel
Diffstat (limited to 'sys/arm/allwinner')
| -rw-r--r-- | sys/arm/allwinner/bus_space.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/arm/allwinner/bus_space.c b/sys/arm/allwinner/bus_space.c index 8f1ce24..4cce820 100644 --- a/sys/arm/allwinner/bus_space.c +++ b/sys/arm/allwinner/bus_space.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Ganbold Tsagaankhuu <ganbold@gmail.com> + * Copyright (C) 2012 FreeBSD Foundation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,11 +10,14 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. + * 3. Neither the name of MARVELL nor the names of contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
