Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304476
b: refs/heads/master
c: 8dc2459
h: refs/heads/master
v: v3
  • Loading branch information
Masanari Iida authored and Greg Kroah-Hartman committed Apr 25, 2012
1 parent b310310 commit c526602
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: a27545bf0bab9027e5c040901b68956551d9f63e
refs/heads/master: 8dc245970a25f51b3862fae7df782a5c0e1777fb
2 changes: 1 addition & 1 deletion trunk/drivers/staging/ozwpan/README
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ technology.

To operate the driver must be bound to a suitable network interface. This can
be done when the module is loaded (specifying the name of the network interface
as a paramter - e.g. 'insmod ozwpan g_net_dev=go0') or can be bound after
as a parameter - e.g. 'insmod ozwpan g_net_dev=go0') or can be bound after
loading using an ioctl call. See the ozappif.h file and the ioctls
OZ_IOCTL_ADD_BINDING and OZ_IOCTL_REMOVE_BINDING.

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/ozwpan/ozhcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ static void oz_process_ep0_urb(struct oz_hcd *ozhcd, struct urb *urb,
oz_trace("USB_REQ_SET_CONFIGURATION - req\n");
break;
case USB_REQ_GET_CONFIGURATION:
/* We short curcuit this case and reply directly since
/* We short circuit this case and reply directly since
* we have the selected configuration number cached.
*/
oz_event_log(OZ_EVT_CTRL_LOCAL, setup->bRequest, 0, 0,
Expand All @@ -1432,7 +1432,7 @@ static void oz_process_ep0_urb(struct oz_hcd *ozhcd, struct urb *urb,
}
break;
case USB_REQ_GET_INTERFACE:
/* We short curcuit this case and reply directly since
/* We short circuit this case and reply directly since
* we have the selected interface alternative cached.
*/
oz_event_log(OZ_EVT_CTRL_LOCAL, setup->bRequest, 0, 0,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/ozwpan/ozusbsvc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* The implementation of this service is split into two parts the first of which
* is protocol independent and the second contains protocol specific details.
* This split is to allow alternative protocols to be defined.
* The implemenation of this service uses ozhcd.c to implement a USB HCD.
* The implementation of this service uses ozhcd.c to implement a USB HCD.
* -----------------------------------------------------------------------------
*/
#include <linux/init.h>
Expand Down

0 comments on commit c526602

Please sign in to comment.