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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
i2c.c
diff --git
a/arch/arm/plat-omap/i2c.c
b/arch/arm/plat-omap/i2c.c
index
679cbd4
..
db071bc
100644
(file)
--- a/
arch/arm/plat-omap/i2c.c
+++ b/
arch/arm/plat-omap/i2c.c
@@
-184,7
+184,7
@@
static inline int omap2_i2c_add_bus(int bus_id)
NULL, 0, 0);
WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", name);
NULL, 0, 0);
WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", name);
- return PTR_
ERR
(pdev);
+ return PTR_
RET
(pdev);
}
#else
static inline int omap2_i2c_add_bus(int bus_id)
}
#else
static inline int omap2_i2c_add_bus(int bus_id)