There were separate README files for softmac and fullmac. Fullmac file contents has been merged into the toplevel README file. Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx> --- drivers/staging/brcm80211/README | 36 +++++++++++++++++++++++++++++ drivers/staging/brcm80211/TODO | 1 - drivers/staging/brcm80211/brcmfmac/README | 35 ---------------------------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/drivers/staging/brcm80211/README b/drivers/staging/brcm80211/README index 99e6766..34fce72 100644 --- a/drivers/staging/brcm80211/README +++ b/drivers/staging/brcm80211/README @@ -88,3 +88,39 @@ Dowan Kim dowan@xxxxxxxxxxxx Roland Vossen rvossen@xxxxxxxxxxxx Arend van Spriel arend@xxxxxxxxxxxx +Broadcom fullmac driver + +This is production driver. + +What's here +=========== +- Completely open source host driver, no binary object files +- Features Broadcom's OneDriver architecture (single source base for + supported chips and architectures) +- On-chip firmware loaded using standard request_firmware() +- Support for BCM4329(SDIO) + +What's done +========== +- Integration with cfg80211 stack +- Most of Mac functionality is performed in dongle +- A-MPDU single stream rates +- BCM4329: Dualband, Single stream, 20MHz channels + +Firmware installation +====================== +Firmware is available from the Linux firmware repository at: + + git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git + http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git + https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git + +For 4329 chip, copy brcm/bcm4329-fullmac-4.bin and brcm/bcm4329-fullmac-4.txt +to /lib/firmware/brcm (or wherever firmware is normally installed on your +system). + +Contact Info: +============= +Brett Rudley brudley@xxxxxxxxxxxx +Henry Ptasinski henryp@xxxxxxxxxxxx +Nohee Ko noheek@xxxxxxxxxxxx diff --git a/drivers/staging/brcm80211/TODO b/drivers/staging/brcm80211/TODO index 24ebadb..0b58844 100644 --- a/drivers/staging/brcm80211/TODO +++ b/drivers/staging/brcm80211/TODO @@ -48,4 +48,3 @@ Henry Ptasinski <henryp@xxxxxxxxxxxx> Dowan Kim <dowan@xxxxxxxxxxxx> Roland Vossen <rvossen@xxxxxxxxxxxx> Arend van Spriel <arend@xxxxxxxxxxxx> - diff --git a/drivers/staging/brcm80211/brcmfmac/README b/drivers/staging/brcm80211/brcmfmac/README index be29e42..139597f 100644 --- a/drivers/staging/brcm80211/brcmfmac/README +++ b/drivers/staging/brcm80211/brcmfmac/README @@ -1,37 +1,2 @@ -Broadcom fullmac driver -This is production driver. - -What's here -=========== -- Completely open source host driver, no binary object files -- Features Broadcom's OneDriver architecture (single source base for - supported chips and architectures) -- On-chip firmware loaded using standard request_firmware() -- Support for BCM4329(SDIO) - -What's done -========== -- Integration with cfg80211 stack -- Most of Mac functionality is performed in dongle -- A-MPDU single stream rates -- BCM4329: Dualband, Single stream, 20MHz channels - -Firmware installation -====================== -Firmware is available from the Linux firmware repository at: - - git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git - http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git - https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git - -For 4329 chip, copy brcm/bcm4329-fullmac-4.bin and brcm/bcm4329-fullmac-4.txt -to /lib/firmware/brcm (or wherever firmware is normally installed on your -system). - -Contact Info: -============= -Brett Rudley brudley@xxxxxxxxxxxx -Henry Ptasinski henryp@xxxxxxxxxxxx -Nohee Ko noheek@xxxxxxxxxxxx -- 1.7.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel