diff options
author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /drivers/staging/go7007/go7007-driver.c | |
parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/staging/go7007/go7007-driver.c')
-rw-r--r-- | drivers/staging/go7007/go7007-driver.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7007/go7007-driver.c index e4ead96679c..58bfc8d81b3 100644 --- a/drivers/staging/go7007/go7007-driver.c +++ b/drivers/staging/go7007/go7007-driver.c @@ -217,6 +217,9 @@ static int init_i2c_module(struct i2c_adapter *adapter, int id, int addr) case I2C_DRIVERID_WIS_OV7640: modname = "wis-ov7640"; break; + case I2C_DRIVERID_S2250: + modname = "s2250-board"; + break; default: modname = NULL; break; @@ -227,7 +230,7 @@ static int init_i2c_module(struct i2c_adapter *adapter, int id, int addr) return 0; if (modname != NULL) printk(KERN_INFO - "go7007: probing for module %s failed", modname); + "go7007: probing for module %s failed\n", modname); else printk(KERN_INFO "go7007: sensor %u seems to be unsupported!\n", id); |