Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/ipv4/fib_frontend.c

1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 9294282b5add..b5eb1f3950b1 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -368,18 +368,15 @@ EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init);
 
 /* Load an i2c sub-device. */
 struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
-                struct i2c_adapter *adapter, const char *module_name,
-                struct i2c_board_info *info, const unsigned short *probe_addrs)
+                struct i2c_adapter *adapter, struct i2c_board_info *info,
+                const unsigned short *probe_addrs)
 {
         struct v4l2_subdev *sd = NULL;
         struct i2c_client *client;
 
         BUG_ON(!v4l2_dev);
 
-        if (module_name)
-                request_module(module_name);
-        else
-                request_module(I2C_MODULE_PREFIX "%s", info->type);
+        request_module(I2C_MODULE_PREFIX "%s", info->type);
 
         /* Create the i2c client */
         if (info->addr == 0 && probe_addrs)
@@ -432,8 +429,7 @@ error:
 EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev_board);
 
 struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
-                struct i2c_adapter *adapter,
-                const char *module_name, const char *client_type,
+                struct i2c_adapter *adapter, const char *client_type,
                 int irq, void *platform_data,
                 u8 addr, const unsigned short *probe_addrs)
 {
@@ -447,8 +443,7 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
         info.irq = irq;
         info.platform_data = platform_data;
 
-        return v4l2_i2c_new_subdev_board(v4l2_dev, adapter, module_name,
-                        &info, probe_addrs);
+        return v4l2_i2c_new_subdev_board(v4l2_dev, adapter, &info, probe_addrs);
 }
 EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev_cfg);