git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-jens' of http://git.drbd.org/linux-2.6-drbd into for-linus
[safe/jmp/linux-2.6]
/
include
/
drm
/
drm_encoder_slave.h
diff --git
a/include/drm/drm_encoder_slave.h
b/include/drm/drm_encoder_slave.h
index
e5e5c94
..
2f65633
100644
(file)
--- a/
include/drm/drm_encoder_slave.h
+++ b/
include/drm/drm_encoder_slave.h
@@
-154,7
+154,7
@@
static inline int drm_i2c_encoder_register(struct module *owner,
*/
static inline void drm_i2c_encoder_unregister(struct drm_i2c_encoder_driver *driver)
{
-
return
i2c_del_driver(&driver->i2c_driver);
+ i2c_del_driver(&driver->i2c_driver);
}
void drm_i2c_encoder_destroy(struct drm_encoder *encoder);