projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...
[linux-2.6-block.git]
/
drivers
/
mfd
/
menf21bmc.c
diff --git
a/drivers/mfd/menf21bmc.c
b/drivers/mfd/menf21bmc.c
index 8f72b1cccbe54d7aa922a26274caf6d6ac7d8f95..9092fac46e35980d79854320cad050f09319a38d 100644
(file)
--- a/
drivers/mfd/menf21bmc.c
+++ b/
drivers/mfd/menf21bmc.c
@@
-49,7
+49,7
@@
static int menf21bmc_wdt_exit_prod_mode(struct i2c_client *client)
}
static int
}
static int
-menf21bmc_probe(struct i2c_client *client
, const struct i2c_device_id *ids
)
+menf21bmc_probe(struct i2c_client *client)
{
int rev_major, rev_minor, rev_main;
int ret;
{
int rev_major, rev_minor, rev_main;
int ret;
@@
-111,7
+111,7
@@
MODULE_DEVICE_TABLE(i2c, menf21bmc_id_table);
static struct i2c_driver menf21bmc_driver = {
.driver.name = "menf21bmc",
.id_table = menf21bmc_id_table,
static struct i2c_driver menf21bmc_driver = {
.driver.name = "menf21bmc",
.id_table = menf21bmc_id_table,
- .probe
= menf21bmc_probe,
+ .probe
_new
= menf21bmc_probe,
};
module_i2c_driver(menf21bmc_driver);
};
module_i2c_driver(menf21bmc_driver);