diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /firmware | |
| parent | 12325280dfeba18164f9c47e226a40ab34e23ee7 (diff) | |
| parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/Makefile | 1 | ||||
| -rw-r--r-- | firmware/isci/isci_firmware.bin.ihex | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 5f43bfba3c7a..0d15a3d113a2 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
| @@ -82,7 +82,6 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \ | |||
| 82 | fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin | 82 | fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin |
| 83 | fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \ | 83 | fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \ |
| 84 | advansys/3550.bin advansys/38C0800.bin | 84 | advansys/3550.bin advansys/38C0800.bin |
| 85 | fw-shipped-$(CONFIG_SCSI_ISCI) += isci/isci_firmware.bin | ||
| 86 | fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \ | 85 | fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \ |
| 87 | qlogic/12160.bin | 86 | qlogic/12160.bin |
| 88 | fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin | 87 | fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin |
diff --git a/firmware/isci/isci_firmware.bin.ihex b/firmware/isci/isci_firmware.bin.ihex deleted file mode 100644 index 2e6619570072..000000000000 --- a/firmware/isci/isci_firmware.bin.ihex +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | :10000000495343554F454D42E80018100002000087 | ||
| 2 | :1000100000000000000000000101000000000000DE | ||
| 3 | :10002000FFFFCF5F0100000008DD0B0000FC0F00A8 | ||
| 4 | :10003000097C0B006EFC0A00FFFFCF5F010000008F | ||
| 5 | :1000400008DD0B0000FC0F00097C0B006EFC0A00B1 | ||
| 6 | :10005000FFFFCF5F0100000008DD0B0000FC0F0078 | ||
| 7 | :10006000097C0B006EFC0A00FFFFCF5F010000005F | ||
| 8 | :1000700008DD0B0000FC0F00097C0B006EFC0A0081 | ||
| 9 | :100080000101000000000000FFFFCF5F0200000040 | ||
| 10 | :1000900008DD0B0000FC0F00097C0B006EFC0A0061 | ||
| 11 | :1000A000FFFFCF5F0200000008DD0B0000FC0F0027 | ||
| 12 | :1000B000097C0B006EFC0A00FFFFCF5F020000000E | ||
| 13 | :1000C00008DD0B0000FC0F00097C0B006EFC0A0031 | ||
| 14 | :1000D000FFFFCF5F0200000008DD0B0000FC0F00F7 | ||
| 15 | :0800E000097C0B006EFC0A0014 | ||
| 16 | :00000001FF | ||