[resend] linux-firmware: Revert prism54 firmware addition due to licensing

[Tim Gardner]

Andy Whitcroft wrote:
> On Tue, Feb 23, 2010 at 12:28:05PM -0500, Chase Douglas wrote:
>> The following changes since commit e2886b568364400f0c4b776e6b5772f40496d342:
>>   Tim Gardner (1):
>>         Ubuntu-1.30
>>
>> are available in the git repository at:
>>
>>   git://kernel.ubuntu.com/cndougla/linux-firmware.git lucid
>>
>> Chase Douglas (1):
>>       Revert "firmware for prism54 kernel >=2.6.29"
>>
>> The firmware is missing a license statement, so these files have been moved to
>> linux-firmware-nonfree.
>>
>>  prism54/isl3877            |  Bin 112128 -> 0 bytes
>>  prism54/isl3890            |  Bin 93996 -> 0 bytes
>>  prism54_softmac/BOM        |    4 ----
>>  prism54_softmac/isl3886pci |  Bin 29036 -> 0 bytes
>>  prism54_softmac/isl3886usb |  Bin 29500 -> 0 bytes
>>  prism54_softmac/isl3887usb |  Bin 29736 -> 0 bytes
>>  6 files changed, 0 insertions(+), 4 deletions(-)
>>  delete mode 100644 prism54/isl3877
>>  delete mode 100644 prism54/isl3890
>>  delete mode 100644 prism54_softmac/BOM
>>  delete mode 100644 prism54_softmac/isl3886pci
>>  delete mode 100644 prism54_softmac/isl3886usb
>>  delete mode 100644 prism54_softmac/isl3887usb
> 
> Is this going to cause a depenancy issue between l-f and l-f-nf ?  I
> presume at least the new l-f-nf will have to conflict with the versions
> of l-f which have these files in?
> 
> -apw
> 

Ah, good catch.

-- 
Tim Gardner tim.gardner at canonical.com