projects
/
powerpc.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 master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[powerpc.git]
/
drivers
/
video
/
matrox
/
matroxfb_maven.c
diff --git
a/drivers/video/matrox/matroxfb_maven.c
b/drivers/video/matrox/matroxfb_maven.c
index
67f8534
..
ad60bbb
100644
(file)
--- a/
drivers/video/matrox/matroxfb_maven.c
+++ b/
drivers/video/matrox/matroxfb_maven.c
@@
-1271,7
+1271,7
@@
ERROR0:;
}
static int maven_attach_adapter(struct i2c_adapter* adapter) {
- if (adapter->id ==
(I2C_ALGO_BIT | I2C_HW_B_G400)
)
+ if (adapter->id ==
I2C_HW_B_G400
)
return i2c_probe(adapter, &addr_data, &maven_detect_client);
return 0;
}