svn commit: r259202 - in head/sys/arm: arm versatile xilinx
John Baldwin
jhb at FreeBSD.org
Tue Dec 10 22:13:37 UTC 2013
Author: jhb
Date: Tue Dec 10 22:13:36 2013
New Revision: 259202
URL: http://svnweb.freebsd.org/changeset/base/259202
Log:
Correct license statements to reflect the fact that these files were all
derived from sys/arm/mv/bus_space.c.
Approved by: core
Modified:
head/sys/arm/arm/bus_space-v6.c
head/sys/arm/versatile/bus_space.c
head/sys/arm/xilinx/zy7_bus_space.c
Modified: head/sys/arm/arm/bus_space-v6.c
==============================================================================
--- head/sys/arm/arm/bus_space-v6.c Tue Dec 10 22:03:59 2013 (r259201)
+++ head/sys/arm/arm/bus_space-v6.c Tue Dec 10 22:13:36 2013 (r259202)
@@ -1,7 +1,9 @@
/*-
- * Copyright (c) 2012 Damjan Marion <damjan.marion at gmail.com>
+ * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
+ * Developed by Semihalf.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -10,11 +12,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)
Modified: head/sys/arm/versatile/bus_space.c
==============================================================================
--- head/sys/arm/versatile/bus_space.c Tue Dec 10 22:03:59 2013 (r259201)
+++ head/sys/arm/versatile/bus_space.c Tue Dec 10 22:13:36 2013 (r259202)
@@ -1,7 +1,9 @@
/*-
- * Copyright (C) 2012 FreeBSD Foundation
+ * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
+ * Developed by Semihalf.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
Modified: head/sys/arm/xilinx/zy7_bus_space.c
==============================================================================
--- head/sys/arm/xilinx/zy7_bus_space.c Tue Dec 10 22:03:59 2013 (r259201)
+++ head/sys/arm/xilinx/zy7_bus_space.c Tue Dec 10 22:13:36 2013 (r259202)
@@ -1,7 +1,9 @@
/*-
- * Copyright (C) 2012 FreeBSD Foundation
+ * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
* All rights reserved.
*
+ * Developed by Semihalf.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
More information about the svn-src-all
mailing list