diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
| commit | 255333c1db3ec63921de29b134418a4e56e5921e (patch) | |
| tree | b1cd99373cabfa6fed020496d4d74500e7bc7e92 /drivers/net/wireless/b43legacy | |
| parent | 9a43b709a230705ca40a6f854a334a02334a3c1c (diff) | |
| parent | 0d66afe7805b169b6bf3c7a88cf8163298b8ef05 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/rc80211_pid_algo.c
Diffstat (limited to 'drivers/net/wireless/b43legacy')
| -rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 82953dd0bae0..f518e796bdec 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
| @@ -3870,7 +3870,7 @@ static void b43legacy_print_driverinfo(void) | |||
| 3870 | #ifdef CONFIG_B43LEGACY_DMA | 3870 | #ifdef CONFIG_B43LEGACY_DMA |
| 3871 | feat_dma = "D"; | 3871 | feat_dma = "D"; |
| 3872 | #endif | 3872 | #endif |
| 3873 | printk(KERN_INFO "Broadcom 43xx driver loaded " | 3873 | printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " |
| 3874 | "[ Features: %s%s%s%s%s, Firmware-ID: " | 3874 | "[ Features: %s%s%s%s%s, Firmware-ID: " |
| 3875 | B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", | 3875 | B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", |
| 3876 | feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma); | 3876 | feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma); |