Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74460
b: refs/heads/master
c: 8376e7a
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and John W. Linville committed Nov 30, 2007
1 parent 15703cf commit 837416a
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 354807e0dd24fa6ad25df614419c1ae8f1a23b47
refs/heads/master: 8376e7a3c2cbf2c91215c35fec9988f581fc699a
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/b43/phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -2214,7 +2214,7 @@ int b43_phy_init_tssi2dbm_table(struct b43_wldev *dev)
}
dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
if (dyn_tssi2dbm == NULL) {
b43err(dev->wl, "Could not allocate memory"
b43err(dev->wl, "Could not allocate memory "
"for tssi2dbm table\n");
return -ENOMEM;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/b43legacy/phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,7 @@ int b43legacy_phy_init_tssi2dbm_table(struct b43legacy_wldev *dev)
phy->idle_tssi = 62;
dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
if (dyn_tssi2dbm == NULL) {
b43legacyerr(dev->wl, "Could not allocate memory"
b43legacyerr(dev->wl, "Could not allocate memory "
"for tssi2dbm table\n");
return -ENOMEM;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -2149,7 +2149,7 @@ int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm)
}
dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
if (dyn_tssi2dbm == NULL) {
printk(KERN_ERR PFX "Could not allocate memory"
printk(KERN_ERR PFX "Could not allocate memory "
"for tssi2dbm table\n");
return -ENOMEM;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/libertas/wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -1528,7 +1528,7 @@ static int wlan_set_encodeext(struct net_device *dev,
&& (ext->key_len != KEY_LEN_WPA_TKIP))
|| ((alg == IW_ENCODE_ALG_CCMP)
&& (ext->key_len != KEY_LEN_WPA_AES))) {
lbs_deb_wext("invalid size %d for key of alg"
lbs_deb_wext("invalid size %d for key of alg "
"type %d\n",
ext->key_len,
alg);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/netwave_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
for (i = 0; i < 6; i++)
dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i);

printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx"
printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, "
"id %c%c, hw_addr %s\n",
dev->name, dev->base_addr, dev->irq,
(u_long) ramBase,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/p54usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)

buf = kmalloc(0x2020, GFP_KERNEL);
if (!buf) {
printk(KERN_ERR "prism54usb: cannot allocate memory for"
printk(KERN_ERR "prism54usb: cannot allocate memory for "
"eeprom readback!\n");
return -ENOMEM;
}
Expand Down

0 comments on commit 837416a

Please sign in to comment.