summaryrefslogtreecommitdiffstats
path: root/firmware/WHENCE
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-16 01:02:40 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-16 01:02:40 -0400
commitc727e7f0071cae66c029f667d48b154c6b64227b (patch)
tree197c2760fcae529d04d56f56e9cd55f51d6d9273 /firmware/WHENCE
parent91df42bedccb919902c7cf7eb876c982ae7f1b1d (diff)
parentee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d (diff)
downloadlinux-c727e7f0071cae66c029f667d48b154c6b64227b.tar.gz
linux-c727e7f0071cae66c029f667d48b154c6b64227b.tar.bz2
linux-c727e7f0071cae66c029f667d48b154c6b64227b.zip
Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'firmware/WHENCE')
-rw-r--r--firmware/WHENCE38
1 files changed, 0 insertions, 38 deletions
diff --git a/firmware/WHENCE b/firmware/WHENCE
index 182ecb6c275e..8388f02de2bd 100644
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@ -89,18 +89,6 @@ Licence: Allegedly GPLv2+, but no source visible. Marked:
Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
--------------------------------------------------------------------------
-Driver: smctr -- SMC ISA/MCA Token Ring adapter
-
-File: tr_smctr.bin
-Info: MCT.BIN v6.3C1 03/01/95
-
-Original licence info:
-
- * This firmware is licensed to you strictly for use in conjunction
- * with the use of SMC TokenRing adapters. There is no waranty
- * expressed or implied about its fitness for any purpose.
-
---------------------------------------------------------------------------
Driver: kaweth -- USB KLSI KL5USB101-based Ethernet device
@@ -567,32 +555,6 @@ Found in hex form in kernel source.
--------------------------------------------------------------------------
-Driver: 3C359 - 3Com 3C359 Token Link Velocity XL adapter
-
-File: 3com/3C359.bin
-
-Licence:
-/*
- * The firmware this driver downloads into the tokenring card is a
- * separate program and is not GPL'd source code, even though the Linux
- * side driver and the routine that loads this data into the card are.
- *
- * This firmware is licensed to you strictly for use in conjunction
- * with the use of 3Com 3C359 TokenRing adapters. There is no
- * waranty expressed or implied about its fitness for any purpose.
- */
-/* 3c359_microcode.mac: 3Com 3C359 Tokenring microcode.
- *
- * Notes:
- * - Loaded from xl_init upon adapter initialization.
- *
- * Available from 3Com as part of their standard 3C359 driver.
- */
-
-Found in hex form in kernel source.
-
---------------------------------------------------------------------------
-
Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter
File: cis/LA-PCM.cis