projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
[deliverable/linux.git]
/
drivers
/
i2c
/
busses
/
scx200_i2c.c
diff --git
a/drivers/i2c/busses/scx200_i2c.c
b/drivers/i2c/busses/scx200_i2c.c
index 8b65a5cf8251f1791f389750518529f7e0e69ec6..e4c98539c51785deb5320fdc88acf9059f796fdf 100644
(file)
--- a/
drivers/i2c/busses/scx200_i2c.c
+++ b/
drivers/i2c/busses/scx200_i2c.c
@@
-1,4
+1,4
@@
-/* linux/drivers/i2c/
scx200_i2c.c
+/* linux/drivers/i2c/
busses/scx200_i2c.c
Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
@@
-81,6
+81,8
@@
static struct i2c_algo_bit_data scx200_i2c_data = {
static struct i2c_adapter scx200_i2c_ops = {
.owner = THIS_MODULE,
static struct i2c_adapter scx200_i2c_ops = {
.owner = THIS_MODULE,
+ .class = I2C_CLASS_HWMON | I2C_CLASS_SPD,
+ .id = I2C_HW_B_SCX200,
.algo_data = &scx200_i2c_data,
.name = "NatSemi SCx200 I2C",
};
.algo_data = &scx200_i2c_data,
.name = "NatSemi SCx200 I2C",
};
@@
-116,7
+118,7
@@
static int scx200_i2c_init(void)
static void scx200_i2c_cleanup(void)
{
static void scx200_i2c_cleanup(void)
{
- i2c_
bit_del_bus
(&scx200_i2c_ops);
+ i2c_
del_adapter
(&scx200_i2c_ops);
}
module_init(scx200_i2c_init);
}
module_init(scx200_i2c_init);
This page took
0.030595 seconds
and
5
git commands to generate.