summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2015-03-10 01:12:39 +0100
committerMichael Brown2015-03-10 01:12:39 +0100
commit03e71d5d1a24c1cb5babf7f56f118cbe9908cfc7 (patch)
treea3b3abcd204786d26a40af1d630cd8bd34d3b383
parent[dm96xx] Add driver for Davicom DM96xx USB Ethernet NICs (diff)
downloadipxe-03e71d5d1a24c1cb5babf7f56f118cbe9908cfc7.tar.gz
ipxe-03e71d5d1a24c1cb5babf7f56f118cbe9908cfc7.tar.xz
ipxe-03e71d5d1a24c1cb5babf7f56f118cbe9908cfc7.zip
[legal] Relicense Davicom DM96xx drivers
Reported-by: Robin Smidsrød <robin@smidsrod.no> Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/drivers/net/dm96xx.c6
-rw-r--r--src/drivers/net/dm96xx.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/drivers/net/dm96xx.c b/src/drivers/net/dm96xx.c
index 71d008fab..58d8dd964 100644
--- a/src/drivers/net/dm96xx.c
+++ b/src/drivers/net/dm96xx.c
@@ -15,9 +15,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <string.h>
#include <unistd.h>
diff --git a/src/drivers/net/dm96xx.h b/src/drivers/net/dm96xx.h
index 7cd144d2f..43a1a4e30 100644
--- a/src/drivers/net/dm96xx.h
+++ b/src/drivers/net/dm96xx.h
@@ -7,7 +7,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <ipxe/usb.h>
#include <ipxe/usbnet.h>