diff options
| author | Michael Brown | 2008-03-22 01:50:06 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-03-22 01:50:06 +0100 |
| commit | 8fceee785f7daaee0e75525ce4e6024cacf4ff61 (patch) | |
| tree | 7e52e6de081f04be30320244cb69eab0309fbbec /src/drivers | |
| parent | [Settings] Bugfix: store_setting() now applies changes even on root block (diff) | |
| parent | ]Drivers] Update licensing for cs89x0.[ch] and cs89x0.txt (diff) | |
| download | ipxe-8fceee785f7daaee0e75525ce4e6024cacf4ff61.tar.gz ipxe-8fceee785f7daaee0e75525ce4e6024cacf4ff61.tar.xz ipxe-8fceee785f7daaee0e75525ce4e6024cacf4ff61.zip | |
Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/net/cs89x0.c | 19 | ||||
| -rw-r--r-- | src/drivers/net/cs89x0.h | 18 | ||||
| -rw-r--r-- | src/drivers/net/cs89x0.txt | 19 |
3 files changed, 56 insertions, 0 deletions
diff --git a/src/drivers/net/cs89x0.c b/src/drivers/net/cs89x0.c index 274faea5..11988add 100644 --- a/src/drivers/net/cs89x0.c +++ b/src/drivers/net/cs89x0.c @@ -1,6 +1,25 @@ #ifdef ALLMULTI #error multicast support is not yet implemented #endif + +/** + 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/src/drivers/net/cs89x0.h b/src/drivers/net/cs89x0.h index b9b36251..696191cf 100644 --- a/src/drivers/net/cs89x0.h +++ b/src/drivers/net/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 diff --git a/src/drivers/net/cs89x0.txt b/src/drivers/net/cs89x0.txt index 4927641d..72b7df28 100644 --- a/src/drivers/net/cs89x0.txt +++ b/src/drivers/net/cs89x0.txt @@ -1,3 +1,22 @@ +/** + Per an email message from Russ Nelson <nelson@crynwr.com> on + 18 March 2008 the files cs89x0.[ch] are 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 +**/ + Permission is granted to distribute the enclosed cs89x0.[ch] driver only in conjunction with the Etherboot package. The code is ordinarily distributed under the GPL. |