staging: brcm80211: unified README files

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@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/README b/drivers/staging/brcm80211/README
index 99e67669f26bcd5fd05e1d988be702f2218f377a..34fce72e0b33a25a5f9fc5670071962ea534e4d0 100644 (file)
--- a/drivers/staging/brcm80211/README
+++ b/drivers/staging/brcm80211/README
@@ -88,3 +88,39 @@ Dowan Kim                    dowan@broadcom.com
 Roland Vossen          rvossen@broadcom.com
 Arend van Spriel       arend@broadcom.com
 
+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@broadcom.com
+Henry Ptasinski henryp@broadcom.com
+Nohee Ko       noheek@broadcom.com

diff --git a/drivers/staging/brcm80211/TODO b/drivers/staging/brcm80211/TODO
index 24ebadbe4241f1ffd5178178d7d07b4eb6451fa5..0b58844eadddf7eedce1c8ab9d720249670f8429 100644 (file)
--- a/drivers/staging/brcm80211/TODO
+++ b/drivers/staging/brcm80211/TODO
@@ -48,4 +48,3 @@ Henry Ptasinski <henryp@broadcom.com>
 Dowan Kim <dowan@broadcom.com>
 Roland Vossen <rvossen@broadcom.com>
 Arend van Spriel <arend@broadcom.com>
-

diff --git a/drivers/staging/brcm80211/brcmfmac/README b/drivers/staging/brcm80211/brcmfmac/README
index be29e423692072d57ea3e0f97f41ec2cbae5c7a2..139597f9cb07c5d48bed18984ec4747f4b4f3438 100644 (file)
--- 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@broadcom.com
-Henry Ptasinski henryp@broadcom.com
-Nohee Ko       noheek@broadcom.com