diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 12:01:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 12:01:22 -0700 |
commit | aeb537e9d7ed7cc9c04b9e48d0e16c667527b0ca (patch) | |
tree | 89e24c17a07d6f3d7746b04e32c25ab37e7e6d44 | |
parent | bfe8ff32ae3c2ae47c26883d7703b64172e62487 (diff) | |
parent | ed7331ed3bf148e9dff512a3b45d60486c91c407 (diff) | |
download | linux-firmware-backup-aeb537e9d7ed7cc9c04b9e48d0e16c667527b0ca.tar.gz |
Merge git://git.infradead.org/~dwmw2/firmware-2.6
* git://git.infradead.org/~dwmw2/firmware-2.6:
qla1280: Fix off-by-some error in firmware loading.
Add README.AddingFirmware file. Basically telling people not to.
firmware: Remove newly-added slicoss and sxg firmware images
firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw
ALSA: wavefront - Always use request_firmware()
Remove fdump tool for av7110 firmware
firmware: convert av7110 driver to request_firmware()
Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card"
Revert "fix modules_install via NFS"
Add-add conflicts in firmware/WHENCE fixed manually
-rw-r--r-- | WHENCE | 92 | ||||
-rw-r--r-- | av7110/bootcode.bin | bin | 0 -> 212 bytes | |||
-rw-r--r-- | slicoss/gbdownload.sys | bin | 98324 -> 0 bytes | |||
-rw-r--r-- | slicoss/gbrcvucode.sys | bin | 2564 -> 0 bytes | |||
-rw-r--r-- | slicoss/oasisdbgdownload.sys | bin | 81940 -> 0 bytes | |||
-rw-r--r-- | slicoss/oasisdownload.sys | bin | 81940 -> 0 bytes | |||
-rw-r--r-- | slicoss/oasisrcvucode.sys | bin | 2564 -> 0 bytes | |||
-rw-r--r-- | sxg/saharadbgdownloadB.sys | bin | 62972 -> 0 bytes | |||
-rw-r--r-- | sxg/saharadownloadB.sys | bin | 54140 -> 0 bytes | |||
-rw-r--r-- | yamaha/yss225_registers.bin | bin | 0 -> 15946 bytes |
10 files changed, 39 insertions, 53 deletions
@@ -8,6 +8,24 @@ kernel. -------------------------------------------------------------------------- +Driver: ambassador -- Madge Ambassador (Collage PCI 155 Server) ATM NIC. + +File: firmware/atmsar11.fw + +Licence: Allegedly GPLv2+, but no source visible. Marked: + + Madge Ambassador ATM Adapter microcode. + Copyright (C) 1995-1999 Madge Networks Ltd. + + This microcode data is placed under the terms of the GNU General + Public License. The GPL is contained in /usr/doc/copyright/GPL on a + Debian system and in the file COPYING in the Linux kernel source. + + We would prefer you not to distribute modified versions without + consultation and not to ask for assembly/other microcode source. + +-------------------------------------------------------------------------- + Driver: korg1212 -- Korg 1212 IO audio device File: korg/k1212.dsp @@ -390,59 +408,6 @@ Found in hex form in kernel source. -------------------------------------------------------------------------- -Driver: SLICOSS - Alacritech IS-NIC products - -File: slicoss/gbdownload.sys.ihex -File: slicoss/gbrcvucode.sys.ihex -File: slicoss/oasisdbgdownload.sys.ihex -File: slicoss/oasisdownload.sys.ihex -File: slicoss/oasisrcvucode.sys.ihex - -Licence: - Copyright (C) 1999-2009 Alacritech, Inc. - - as an unpublished work. This notice does not imply unrestricted or - public access to the source code from which this firmware image is - derived. Except as noted below this firmware image may not be - reproduced, used, sold or transferred to any third party without - Alacritech's prior written consent. All Rights Reserved. - - Permission is hereby granted for the distribution of this firmware - image as part of a Linux or other Open Source operating system kernel - in text or binary form as required. - - This firmware may not be modified and may only be used with - Alacritech hardware. - -Found in hex form in kernel source. - --------------------------------------------------------------------------- - -Driver: SXG - Alacritech IS-NIC products - -File: sxg/saharadownloadB.sys.ihex -File: sxg/saharadbgdownloadB.sys.ihex - -Licence: - Copyright (C) 1999-2009 Alacritech, Inc. - - as an unpublished work. This notice does not imply unrestricted or - public access to the source code from which this firmware image is - derived. Except as noted below this firmware image may not be - reproduced, used, sold or transferred to any third party without - Alacritech's prior written consent. All Rights Reserved. - - Permission is hereby granted for the distribution of this firmware - image as part of a Linux or other Open Source operating system kernel - in text or binary form as required. - - This firmware may not be modified and may only be used with - Alacritech hardware. - -Found in hex form in kernel source. - --------------------------------------------------------------------------- - Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter File: cxgb3/t3b_psram-1.1.0.bin.ihex @@ -662,3 +627,24 @@ Licence: Found in hex form in kernel source. -------------------------------------------------------------------------- + +Driver: DVB AV7110 -- AV7110 cards + +File: av7110/bootcode.bin + +Licence: GPLv2 or later + +ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S + +-------------------------------------------------------------------------- + +Driver: wavefront - ISA WaveFront sound card + +File: yamaha/yss225_registers.bin + +Licence: Allegedly GPLv2+, but no source visible. + +Found in hex form in kernel source, with the following comment: + Copyright (c) 1998-2002 by Paul Davis <pbd@op.net> + +-------------------------------------------------------------------------- diff --git a/av7110/bootcode.bin b/av7110/bootcode.bin Binary files differnew file mode 100644 index 00000000..f3157759 --- /dev/null +++ b/av7110/bootcode.bin diff --git a/slicoss/gbdownload.sys b/slicoss/gbdownload.sys Binary files differdeleted file mode 100644 index 60ab75b6..00000000 --- a/slicoss/gbdownload.sys +++ /dev/null diff --git a/slicoss/gbrcvucode.sys b/slicoss/gbrcvucode.sys Binary files differdeleted file mode 100644 index 855b23e4..00000000 --- a/slicoss/gbrcvucode.sys +++ /dev/null diff --git a/slicoss/oasisdbgdownload.sys b/slicoss/oasisdbgdownload.sys Binary files differdeleted file mode 100644 index 4ae50238..00000000 --- a/slicoss/oasisdbgdownload.sys +++ /dev/null diff --git a/slicoss/oasisdownload.sys b/slicoss/oasisdownload.sys Binary files differdeleted file mode 100644 index cdc2cc11..00000000 --- a/slicoss/oasisdownload.sys +++ /dev/null diff --git a/slicoss/oasisrcvucode.sys b/slicoss/oasisrcvucode.sys Binary files differdeleted file mode 100644 index a2b9bde8..00000000 --- a/slicoss/oasisrcvucode.sys +++ /dev/null diff --git a/sxg/saharadbgdownloadB.sys b/sxg/saharadbgdownloadB.sys Binary files differdeleted file mode 100644 index d3b3ed12..00000000 --- a/sxg/saharadbgdownloadB.sys +++ /dev/null diff --git a/sxg/saharadownloadB.sys b/sxg/saharadownloadB.sys Binary files differdeleted file mode 100644 index c48cb92b..00000000 --- a/sxg/saharadownloadB.sys +++ /dev/null diff --git a/yamaha/yss225_registers.bin b/yamaha/yss225_registers.bin Binary files differnew file mode 100644 index 00000000..99e97900 --- /dev/null +++ b/yamaha/yss225_registers.bin |