Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (60 commits)
  [NIU]: Bump driver version and release date.
  [NIU]: Fix BMAC alternate MAC address indexing.
  net: fix kernel-doc warnings in header files
  [IPV6]: Use BUG_ON instead of if + BUG in fib6_del_route.
  [IPV6]: dst_entry leak in ip4ip6_err. (resend)
  bluetooth: do not move child device other than rfcomm
  bluetooth: put hci dev after del conn
  [NET]: Elminate spurious print_mac() calls.
  [BLUETOOTH] hci_sysfs.c: Kill build warning.
  [NET]: Remove MAC_FMT
  net/8021q/vlan_dev.c: Use print_mac.
  [XFRM]: Fix ordering issue in xfrm_dst_hash_transfer().
  [BLUETOOTH] net/bluetooth/hci_core.c: Use time_* macros
  [IPV6]: Fix hardcoded removing of old module code
  [NETLABEL]: Move some initialization code into __init section.
  [NETLABEL]: Shrink the genl-ops registration code.
  [AX25] ax25_out: check skb for NULL in ax25_kick()
  [TCP]: Fix tcp_v4_send_synack() comment
  [IPV4]: fix alignment of IP-Config output
  Documentation: fix tcp.txt
  ...

2 files changed, 41 insertions, 5 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 08a011f0834a..f13346ba9dd2 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -14,6 +14,12 @@
 #include "lo.h"
 #include "phy.h"
 
+
+/* The unique identifier of the firmware that's officially supported by
+ * this driver version. */
+#define B43_SUPPORTED_FIRMWARE_ID       "FW13"
+
+
 #ifdef CONFIG_B43_DEBUG
 # define B43_DEBUG      1
 #else
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index ef65c41af00f..51dfce16178a 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -58,6 +58,8 @@ MODULE_AUTHOR("Stefano Brivio");
 MODULE_AUTHOR("Michael Buesch");
 MODULE_LICENSE("GPL");
 
+MODULE_FIRMWARE(B43_SUPPORTED_FIRMWARE_ID);
+
 
 static int modparam_bad_frames_preempt;
 module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
@@ -1859,11 +1861,11 @@ static int b43_upload_microcode(struct b43_wldev *dev)
                 err = -EOPNOTSUPP;
                 goto error;
         }
-        b43dbg(dev->wl, "Loading firmware version %u.%u "
-               "(20%.2i-%.2i-%.2i %.2i:%.2i:%.2i)\n",
-               fwrev, fwpatch,
-               (fwdate >> 12) & 0xF, (fwdate >> 8) & 0xF, fwdate & 0xFF,
-               (fwtime >> 11) & 0x1F, (fwtime >> 5) & 0x3F, fwtime & 0x1F);
+        b43info(dev->wl, "Loading firmware version %u.%u "
+                "(20%.2i-%.2i-%.2i %.2i:%.2i:%.2i)\n",
+                fwrev, fwpatch,
+                (fwdate >> 12) & 0xF, (fwdate >> 8) & 0xF, fwdate & 0xFF,
+                (fwtime >> 11) & 0x1F, (fwtime >> 5) & 0x3F, fwtime & 0x1F);
 
         dev->fw.rev = fwrev;
         dev->fw.patch = fwpatch;
@@ -4200,6 +4202,33 @@ static struct ssb_driver b43_ssb_driver = {
         .resume         = b43_resume,
 };
 
+static void b43_print_driverinfo(void)
+{
+        const char *feat_pci = "", *feat_pcmcia = "", *feat_nphy = "",
+                   *feat_leds = "", *feat_rfkill = "";
+
+#ifdef CONFIG_B43_PCI_AUTOSELECT
+        feat_pci = "P";
+#endif
+#ifdef CONFIG_B43_PCMCIA
+        feat_pcmcia = "M";
+#endif
+#ifdef CONFIG_B43_NPHY
+        feat_nphy = "N";
+#endif
+#ifdef CONFIG_B43_LEDS
+        feat_leds = "L";
+#endif
+#ifdef CONFIG_B43_RFKILL
+        feat_rfkill = "R";
+#endif
+        printk(KERN_INFO "Broadcom 43xx driver loaded "
+               "[ Features: %s%s%s%s%s, Firmware-ID: "
+               B43_SUPPORTED_FIRMWARE_ID " ]\n",
+               feat_pci, feat_pcmcia, feat_nphy,
+               feat_leds, feat_rfkill);
+}
+
 static int __init b43_init(void)
 {
         int err;
@@ -4211,6 +4240,7 @@ static int __init b43_init(void)
         err = ssb_driver_register(&b43_ssb_driver);
         if (err)
                 goto err_pcmcia_exit;
+        b43_print_driverinfo();
 
         return err;