Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186547
b: refs/heads/master
c: 2ed71d5
h: refs/heads/master
i:
  186545: 7f4ef4c
  186543: b65ba19
v: v3
  • Loading branch information
Adam Buchbinder authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 6db07c1 commit f3d75c9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 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: 59277b679f8b5ce594e367759256668eba652d0d
refs/heads/master: 2ed71d5a14c887b7632aa21579ff7fc5770381d8
2 changes: 1 addition & 1 deletion trunk/drivers/staging/altpciechdma/altpciechdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id)
}
/* remember which irq we allocated */
ape->irq_line = (int)irq_line;
printk(KERN_DEBUG "Succesfully requested IRQ #%d with dev_id 0x%p\n", irq_line, ape);
printk(KERN_DEBUG "Successfully requested IRQ #%d with dev_id 0x%p\n", irq_line, ape);
#endif
/* show BARs */
scan_bars(ape, dev);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rt2860/sta/connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ u8 CipherSuiteWpaNoneAes[] = {
u8 CipherSuiteWpaNoneAesLen =
(sizeof(CipherSuiteWpaNoneAes) / sizeof(u8));

/* The following MACRO is called after 1. starting an new IBSS, 2. succesfully JOIN an IBSS, */
/* or 3. succesfully ASSOCIATE to a BSS, 4. successfully RE_ASSOCIATE to a BSS */
/* The following MACRO is called after 1. starting an new IBSS, 2. successfully JOIN an IBSS, */
/* or 3. successfully ASSOCIATE to a BSS, 4. successfully RE_ASSOCIATE to a BSS */
/* All settings successfuly negotiated furing MLME state machines become final settings */
/* and are copied to pAd->StaActive */
#define COPY_SETTINGS_FROM_MLME_AUX_TO_ACTIVE_CFG(_pAd) \
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/wlags49_h2/wl_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ int wl_open(struct net_device *dev)
wl_lock( lp, &flags );

if( status != HCF_SUCCESS ) {
// Unsuccesfull, try reset of the card to recover
// Unsuccessful, try reset of the card to recover
status = wl_reset( dev );
}

Expand Down

0 comments on commit f3d75c9

Please sign in to comment.