diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-05 17:09:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-05 17:09:28 +1100 |
| commit | 549afa5723bc239db7eeb65aa3bb5501a2d37578 (patch) | |
| tree | 072b527a704984b4a0fa28fcf6873ddd1193e4ea /drivers/i2c | |
| parent | cbf9353bef2843b80f7685745c756e85f68997f6 (diff) | |
| parent | 3adb180e7e6d90dd486f13c02c378956053be8dc (diff) | |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 0037e31076ba..bd86a8554364 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -849,7 +849,7 @@ static const struct i2c_algorithm omap_i2c_algo = { .functionality = omap_i2c_func, }; -static int __init +static int __devinit omap_i2c_probe(struct platform_device *pdev) { struct omap_i2c_dev *dev; |