Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357432
b: refs/heads/master
c: c6c0391
h: refs/heads/master
v: v3
  • Loading branch information
Sachin Kamat authored and Mauro Carvalho Chehab committed Feb 5, 2013
1 parent 03296ab commit 70b3dec
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 44e2b09ca468c7c91fa4bb8058fcda38f344974a
refs/heads/master: c6c03915b630c2b4e488be4f21ab46703e31c16b
7 changes: 4 additions & 3 deletions trunk/drivers/media/i2c/s5c73m3/s5c73m3-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
int s5c73m3_dbg;
module_param_named(debug, s5c73m3_dbg, int, 0644);

int boot_from_rom = 1;
static int boot_from_rom = 1;
module_param(boot_from_rom, int, 0644);

int update_fw;
static int update_fw;
module_param(update_fw, int, 0644);

#define S5C73M3_EMBEDDED_DATA_MAXLEN SZ_4K
Expand Down Expand Up @@ -295,7 +295,8 @@ int s5c73m3_isp_command(struct s5c73m3 *state, u16 command, u16 data)
return s5c73m3_write(state, REG_STATUS, 0x0001);
}

int s5c73m3_isp_comm_result(struct s5c73m3 *state, u16 command, u16 *data)
static int s5c73m3_isp_comm_result(struct s5c73m3 *state, u16 command,
u16 *data)
{
return s5c73m3_read(state, COMM_RESULT_OFFSET + command, data);
}
Expand Down

0 comments on commit 70b3dec

Please sign in to comment.