Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 85797
b: refs/heads/master
c: 26bc783
h: refs/heads/master
i:
  85795: 5e097af
v: v3
  • Loading branch information
Michael Buesch authored and John W. Linville committed Feb 15, 2008
1 parent 8bcdd9e commit 3837858
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e118f0ed866afab654a438b85643d4f1472f28b
refs/heads/master: 26bc783f8cf7227718f8b4cbc32f0c3a898b128f
6 changes: 6 additions & 0 deletions trunk/drivers/net/wireless/b43/b43.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 28 additions & 0 deletions trunk/drivers/net/wireless/b43/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4200,6 +4200,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;
Expand All @@ -4211,6 +4238,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;

Expand Down

0 comments on commit 3837858

Please sign in to comment.