git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
media
/
pci
/
mantis
/
mantis_i2c.c
diff --git
a/drivers/media/pci/mantis/mantis_i2c.c
b/drivers/media/pci/mantis/mantis_i2c.c
index
e779451
..
937fb9d
100644
(file)
--- a/
drivers/media/pci/mantis/mantis_i2c.c
+++ b/
drivers/media/pci/mantis/mantis_i2c.c
@@
-217,7
+217,7
@@
static struct i2c_algorithm mantis_algo = {
.functionality = mantis_i2c_func,
};
-int
__devinit
mantis_i2c_init(struct mantis_pci *mantis)
+int mantis_i2c_init(struct mantis_pci *mantis)
{
u32 intstat, intmask;
struct i2c_adapter *i2c_adapter = &mantis->adapter;