Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317277
b: refs/heads/master
c: ef73b7a
h: refs/heads/master
i:
  317275: 4caed64
v: v3
  • Loading branch information
Justin P. Mattock authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent c74929c commit d671d47
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 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: 02fd3b3670fb99017b17757d33a0a17e2405920c
refs/heads/master: ef73b7a45dfd3c4cdd447a6767422349e5fe7242
2 changes: 1 addition & 1 deletion trunk/drivers/staging/sbe-2t3e3/dc.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void dc_init(struct channel *sc)
SBE_2T3E3_21143_VAL_NUMBER_OF_RECEIVE_PACKETS;
dc_write(sc->addr, SBE_2T3E3_21143_REG_GENERAL_PURPOSE_TIMER_AND_INTERRUPT_MITIGATION_CONTROL, val);

/* prepare descriptors and data for receive and transmit procecsses */
/* prepare descriptors and data for receive and transmit processes */
if (dc_init_descriptor_list(sc) != 0)
return;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/sbe-2t3e3/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/* All access to registers done via the 21143 on port 0 must be
* protected via the card->bootrom_lock. */

/* priviate define to be used here only - must be protected by card->bootrom_lock */
/* private define to be used here only - must be protected by card->bootrom_lock */
#define cpld_write_nolock(channel, reg, val) \
bootrom_write((channel), CPLD_MAP_REG(reg, channel), val)

Expand Down

0 comments on commit d671d47

Please sign in to comment.