diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-09-29 12:34:46 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-29 12:34:46 -0700 |
| commit | 347bcf7521e0d300fed253c39553f98fddec8a3d (patch) | |
| tree | 4aa8327359b65879e02bc98c035699f151235a41 /drivers/i2c/busses | |
| parent | a249a0aa389491494231d92e8143d11f17b17487 (diff) | |
| parent | 7eb6532a8361fbe0b36e0f6f529e1e6eb4b06619 (diff) | |
| download | kernel_samsung_tuna-347bcf7521e0d300fed253c39553f98fddec8a3d.zip kernel_samsung_tuna-347bcf7521e0d300fed253c39553f98fddec8a3d.tar.gz kernel_samsung_tuna-347bcf7521e0d300fed253c39553f98fddec8a3d.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'drivers/i2c/busses')
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index fbe2365..3626323 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1163,8 +1163,6 @@ omap_i2c_probe(struct platform_device *pdev) goto err_free_irq; } - i2c_detect_ext_master(adap); - return 0; err_free_irq: |