Merge branch 'topic/hda' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / staging / go7007 / go7007-driver.c

diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7007/go7007-driver.c
index 81ae4b0fa8902e720dc7b4a4120ae3f9c798838f..58bfc8d81b3b3f6a25203c0767bcdad8907ee639 100644 (file)
--- a/drivers/staging/go7007/go7007-driver.c
+++ b/drivers/staging/go7007/go7007-driver.c
@@ -16,7 +16,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
@@ -218,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;
@@ -228,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);