Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259554
b: refs/heads/master
c: 1fddb42
h: refs/heads/master
v: v3
  • Loading branch information
Tim Retout authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent d9bde53 commit e8dec04
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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: fcfd8ac0a599dc99eb67259ed809312dc8c4df51
refs/heads/master: 1fddb42caff955d072e4ea55ae0a55549840e971
4 changes: 2 additions & 2 deletions trunk/drivers/staging/sep/sep_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1102,9 +1102,9 @@ static int sep_lock_user_pages(struct sep_device *sep,
"lli_array[%x].bus_address is "
"%08lx, lli_array[%x].block_size is %x\n",
num_pages - 1,
(unsigned long)lli_array[num_pages -1].bus_address,
(unsigned long)lli_array[num_pages - 1].bus_address,
num_pages - 1,
lli_array[num_pages -1].block_size);
lli_array[num_pages - 1].block_size);
}

/* Set output params according to the in_out flag */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/sep/sep_driver_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ held by the process (struct file) */
/* offset of the caller id area */
#define SEP_CALLER_ID_OFFSET_BYTES \
(SEP_DRIVER_SYSTEM_RAR_MEMORY_OFFSET_IN_BYTES + \
SEP_DRIVER_SYSTEM_RAR_MEMORY_SIZE_IN_BYTES)
SEP_DRIVER_SYSTEM_RAR_MEMORY_SIZE_IN_BYTES)

/* offset of the DCB area */
#define SEP_DRIVER_SYSTEM_DCB_MEMORY_OFFSET_IN_BYTES \
Expand Down

0 comments on commit e8dec04

Please sign in to comment.