diff --git a/[refs] b/[refs] index 1968287a06c5..69d5602c26e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 673abc4411ef9391b949aa43cc77fe42d6a8571d +refs/heads/master: 8cd3a48ffbb05f2d41bef61c0681fe44eeaabb2e diff --git a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c index 0b717275f10c..bc7a561b4ad6 100644 --- a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +++ b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c @@ -879,7 +879,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata) * the rmi4 Physical Device Table and enumerate any rmi4 functions that * have data sources associated with them. */ -static int __devinit synaptics_rmi4_probe +static int synaptics_rmi4_probe (struct i2c_client *client, const struct i2c_device_id *dev_id) { int retval;