[firmware-nonfree] 15/20: misc-nonfree: Include Comtrol RocketPort 2 firmware for use with the rp2 driver

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-nonfree.

commit 945543f5f8dddcbd1dc41019a93b25ee4fca7e7c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Sep 17 23:42:55 2016 +0100

    misc-nonfree: Include Comtrol RocketPort 2 firmware for use with the rp2 driver
---
 debian/changelog                   |  2 ++
 debian/config/misc-nonfree/LICENSE | 12 ++++++++++++
 debian/config/misc-nonfree/defines |  4 ++++
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 94e9417..b0f530b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ firmware-nonfree (20160824-1) UNRELEASED; urgency=medium
   * misc-nonfree: Include Terratec H5 DRX-K firmware for use with the
     em28xx-dvb driver
   * iwlwifi: Include Intel Wireless 8264 Bluetooth firmware
+  * misc-nonfree: Include Comtrol RocketPort 2 firmware for use with the
+    rp2 driver
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 28 Aug 2016 22:31:16 +0100
 
diff --git a/debian/config/misc-nonfree/LICENSE b/debian/config/misc-nonfree/LICENSE
index bfc5698..ce4e069 100644
--- a/debian/config/misc-nonfree/LICENSE
+++ b/debian/config/misc-nonfree/LICENSE
@@ -634,6 +634,18 @@ Files: qat_*.bin
 Copyright: 2014, Intel Corporation.
 License: Binary redistribution (Intel)
 
+Files: rp2.fw
+Copyright: 2013, Comtrol Corporation
+License: Binary redistribution (Comtrol)
+ Comtrol grants permission to use and redistribute these firmware
+ files for use with Comtrol devices, but not as part of the Linux
+ kernel or in any other form which would require these files themselves
+ to be covered by the terms of the GNU General Public License.
+ .
+ These firmware files are distributed in the hope that they will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 Files: rt*.bin
 Copyright: 2007, Ralink Technology Corporation
 License: Binary redistribution (Ralink)
diff --git a/debian/config/misc-nonfree/defines b/debian/config/misc-nonfree/defines
index a40a32c..86ef733 100644
--- a/debian/config/misc-nonfree/defines
+++ b/debian/config/misc-nonfree/defines
@@ -94,6 +94,7 @@ files:
  qat_c62x.bin
  qat_c62x_mmp.bin
  qat_mmp.bin
+ rp2.fw
  rt2561.bin
  rt2561s.bin
  rt2661.bin
@@ -380,6 +381,9 @@ desc: Intel QAT C62x UOF firmware
 [qat_c62x_mmp.bin_base]
 desc: Intel QAT C62x MMP firmware
 
+[rp2.fw_base]
+desc: Comtrol RocketPort 2 firmware
+
 [rt2561.bin_base]
 desc: Ralink RT2561 (RT2501/RT5201 chipset) firmware
 version: 1.2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git