git.samba.org
/
sfrench
/
cifs-2.6.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://one.firstfloor.org/home/andi/git/linux-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
i2c
/
busses
/
scx200_i2c.c
diff --git
a/drivers/i2c/busses/scx200_i2c.c
b/drivers/i2c/busses/scx200_i2c.c
index 6cd96e43aa72a9d50ebbc8eb8a66c327bca761dc..c3022a023449ec2012b7911c0be94d8f7446869b 100644
(file)
--- a/
drivers/i2c/busses/scx200_i2c.c
+++ b/
drivers/i2c/busses/scx200_i2c.c
@@
-81,6
+81,7
@@
static struct i2c_algo_bit_data scx200_i2c_data = {
static struct i2c_adapter scx200_i2c_ops = {
.owner = THIS_MODULE,
+ .id = I2C_HW_B_SCX200,
.algo_data = &scx200_i2c_data,
.name = "NatSemi SCx200 I2C",
};