2008-05-20 Robert Millan <rmh@aybabtu.com>

        * netboot/cs89x0.c: Fix license violation.
        * netboot/cs89x0.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index b2464143f36423d1a0dd33059c4042ab9eac9126..3362968063dbeb8dec75b7ec3f0e202081843ec2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-20  Robert Millan  <rmh@aybabtu.com>
+
+       * netboot/cs89x0.c: Fix license violation.
+       * netboot/cs89x0.h: Likewise.
+
 2008-04-10  Pavel Roskin  <proski@gnu.org>
 
        * configure.ac: Always use "_cv_" in cache variables for

diff --git a/netboot/cs89x0.c b/netboot/cs89x0.c
index 9f964811d95398a4e64d3414db9c4d903d19cd0b..115257fa3812f72caa398cd0e06bef6fc984cb6f 100644 (file)
--- a/netboot/cs89x0.c
+++ b/netboot/cs89x0.c
@@ -1,3 +1,21 @@
+/**
+   Per an email message from Russ Nelson <nelson@crynwr.com> on
+   18 March 2008 this file is now licensed under GPL Version 2.
+
+   From: Russ Nelson <nelson@crynwr.com>
+   Date: Tue, 18 Mar 2008 12:42:00 -0400
+   Subject: Re: [Etherboot-developers] cs89x0 driver in etherboot
+   -- quote from email
+   As copyright holder, if I say it doesn't conflict with the GPL,
+   then it doesn't conflict with the GPL.
+
+   However, there's no point in causing people's brains to overheat,
+   so yes, I grant permission for the code to be relicensed under the
+   GPLv2.  Please make sure that this change in licensing makes its
+   way upstream.  -russ
+   -- quote from email
+**/
+
 /* cs89x0.c: A Crystal Semiconductor CS89[02]0 driver for etherboot. */
 /*
   Permission is granted to distribute the enclosed cs89x0.[ch] driver

diff --git a/netboot/cs89x0.h b/netboot/cs89x0.h
index b1806f474df35e72eb656e90c29b319894980764..6350dc87409e7fb9ff7946178f7ca369f4815680 100644 (file)
--- a/netboot/cs89x0.h
+++ b/netboot/cs89x0.h
@@ -1,3 +1,21 @@
+/**
+   Per an email message from Russ Nelson <nelson@crynwr.com> on
+   18 March 2008 this file is now licensed under GPL Version 2.
+
+   From: Russ Nelson <nelson@crynwr.com>
+   Date: Tue, 18 Mar 2008 12:42:00 -0400
+   Subject: Re: [Etherboot-developers] cs89x0 driver in etherboot
+   -- quote from email
+   As copyright holder, if I say it doesn't conflict with the GPL,
+   then it doesn't conflict with the GPL.
+
+   However, there's no point in causing people's brains to overheat,
+   so yes, I grant permission for the code to be relicensed under the
+   GPLv2.  Please make sure that this change in licensing makes its
+   way upstream.  -russ
+   -- quote from email
+**/
+
 /*  Copyright, 1988-1992, Russell Nelson, Crynwr Software
 
    This program is free software; you can redistribute it and/or modify