Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 318011
b: refs/heads/master
c: d761074
h: refs/heads/master
i:
  318009: 8420805
  318007: 112ef5d
v: v3
  • Loading branch information
Justin P. Mattock authored and Greg Kroah-Hartman committed Jul 17, 2012
1 parent 42d5d6c commit 322e7b8
Show file tree
Hide file tree
Showing 2 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: 71063199213795b886329f3e8e02ad6c1589efea
refs/heads/master: d761074bfa05c763353c265aea3e8781f733a03e
8 changes: 4 additions & 4 deletions trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
Original file line number Diff line number Diff line change
Expand Up @@ -655,13 +655,13 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata,
}

/**
* synpatics_rmi4_touchpad_config() - confiures the rmi4 touchpad device
* synaptics_rmi4_touchpad_config() - configures the rmi4 touchpad device
* @pdata: pointer to synaptics_rmi4_data structure
* @rfi: pointer to synaptics_rmi4_fn structure
*
* This function calls to confiures the rmi4 touchpad device
* This function calls to configures the rmi4 touchpad device
*/
int synpatics_rmi4_touchpad_config(struct synaptics_rmi4_data *pdata,
int synaptics_rmi4_touchpad_config(struct synaptics_rmi4_data *pdata,
struct synaptics_rmi4_fn *rfi)
{
/*
Expand Down Expand Up @@ -855,7 +855,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
if (rfi->num_of_data_sources) {
if (rfi->fn_number ==
SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM) {
retval = synpatics_rmi4_touchpad_config
retval = synaptics_rmi4_touchpad_config
(pdata, rfi);
if (retval < 0)
return retval;
Expand Down

0 comments on commit 322e7b8

Please sign in to comment.