diff options
| author | marcel <marcel@FreeBSD.org> | 2003-10-27 22:54:34 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2003-10-27 22:54:34 +0000 |
| commit | 23e5537e11ff51eae18842960e3440f3192d66b7 (patch) | |
| tree | dd20e3c53f700d43688e3837f9a8a6f5a9781e5f /sys | |
| parent | 0e8406cd424af80be4aa7bac5d9d4ea34fd68be4 (diff) | |
| download | FreeBSD-src-23e5537e11ff51eae18842960e3440f3192d66b7.zip FreeBSD-src-23e5537e11ff51eae18842960e3440f3192d66b7.tar.gz | |
The previous commit removed both clause 3 and clause 4 from the UCB
license. Only clause 3 has been revoked. Restore the fourth clause
as clause 3.
Pointed out by: das@
Remove my name as a copyright holder since I don't use a BSD license
compatible or comparable to the UCB license. I choose not to add a
complete second license for my work for aesthetic reasons, nor to
replace the UCB license on grounds of rewriting more than 90% of the
source files. The rewrite can also be seen as an enhancement and since
the files were practically empty, it's rather trivial to have changed
90% of the files.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ia64/ia64/sys_machdep.c | 7 | ||||
| -rw-r--r-- | sys/ia64/include/sysarch.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/ia64/ia64/sys_machdep.c b/sys/ia64/ia64/sys_machdep.c index c032a8c..d4dcc1f 100644 --- a/sys/ia64/ia64/sys_machdep.c +++ b/sys/ia64/ia64/sys_machdep.c @@ -1,17 +1,18 @@ -/* - * Copyright (c) 2003 Marcel Moolenaar +/*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 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 the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/sys/ia64/include/sysarch.h b/sys/ia64/include/sysarch.h index d4a0b01..b418985 100644 --- a/sys/ia64/include/sysarch.h +++ b/sys/ia64/include/sysarch.h @@ -1,17 +1,18 @@ -/* - * Copyright (c) 2003 Marcel Moolenaar +/*- * Copyright (c) 1993 The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 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 the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
