24 files changed, 153 insertions, 54 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 89d8d37838a..3b26fbd3e55 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -901,7 +901,7 @@ endif # V4L_USB_DRIVERS
 
 config SOC_CAMERA
         tristate "SoC camera support"
-        depends on VIDEO_V4L2
+        depends on VIDEO_V4L2 && HAS_DMA
         select VIDEOBUF_DMA_SG
         help
           SoC Camera is a common API to several cameras, not connecting
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 2ca3e9cfb2b..0165aac533b 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -2613,7 +2613,7 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
         struct bttv_fh *fh = priv;
 
         mutex_lock(&fh->cap.vb_lock);
-        retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
+        retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
                                      V4L2_MEMORY_MMAP);
         if (retval < 0) {
                 mutex_unlock(&fh->cap.vb_lock);
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c
index 2a429f9e32c..03411503457 100644
--- a/drivers/media/video/cs5345.c
+++ b/drivers/media/video/cs5345.c
@@ -160,10 +160,17 @@ static int cs5345_probe(struct i2c_client *client,
 
 /* ----------------------------------------------------------------------- */
 
+static const struct i2c_device_id cs5345_id[] = {
+        { "cs5345", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, cs5345_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "cs5345",
         .driverid = I2C_DRIVERID_CS5345,
         .command = cs5345_command,
         .probe = cs5345_probe,
+        .id_table = cs5345_id,
 };
 
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 2dfd0afc62d..d965af860ab 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -144,7 +144,8 @@ static int cs53l32a_probe(struct i2c_client *client,
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -EIO;
 
-        snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");
+        if (!id)
+                strlcpy(client->name, "cs53l32a", sizeof(client->name));
 
         v4l_info(client, "chip found @ 0x%x (%s)\n",
                         client->addr << 1, client->adapter->name);
@@ -175,10 +176,17 @@ static int cs53l32a_probe(struct i2c_client *client,
         return 0;
 }
 
+static const struct i2c_device_id cs53l32a_id[] = {
+        { "cs53l32a", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, cs53l32a_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "cs53l32a",
         .driverid = I2C_DRIVERID_CS53L32A,
         .command = cs53l32a_command,
         .probe = cs53l32a_probe,
+        .id_table = cs53l32a_id,
 };
 
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 4f08a4058d1..1d6c51a7531 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -74,7 +74,7 @@ static const u8 hw_bus[] = {
 };
 
 /* This array should match the CX18_HW_ defines */
-static const char * const hw_drivernames[] = {
+static const char * const hw_devicenames[] = {
         "tuner",
         "tveeprom",
         "cs5345",
@@ -95,8 +95,7 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
         id = hw_driverids[idx];
         bus = hw_bus[idx];
         memset(&info, 0, sizeof(info));
-        strlcpy(info.driver_name, hw_drivernames[idx],
-                        sizeof(info.driver_name));
+        strlcpy(info.type, hw_devicenames[idx], sizeof(info.type));
         info.addr = hw_addrs[idx];
         for (i = 0; i < I2C_CLIENTS_MAX; i++)
                 if (cx->i2c_clients[i] == NULL)
@@ -279,7 +278,7 @@ static const char *cx18_i2c_id_name(u32 id)
 
         for (i = 0; i < ARRAY_SIZE(hw_driverids); i++)
                 if (hw_driverids[i] == id)
-                        return hw_drivernames[i];
+                        return hw_devicenames[i];
         return "unknown device";
 }
 
@@ -290,7 +289,7 @@ static const char *cx18_i2c_hw_name(u32 hw)
 
         for (i = 0; i < ARRAY_SIZE(hw_driverids); i++)
                 if (1 << i == hw)
-                        return hw_drivernames[i];
+                        return hw_devicenames[i];
         return "unknown device";
 }
 
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 88823810497..607efdcd22f 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1284,10 +1284,17 @@ static int cx25840_remove(struct i2c_client *client)
         return 0;
 }
 
+static const struct i2c_device_id cx25840_id[] = {
+        { "cx25840", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, cx25840_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "cx25840",
         .driverid = I2C_DRIVERID_CX25840,
         .command = cx25840_command,
         .probe = cx25840_probe,
         .remove = cx25840_remove,
+        .id_table = cx25840_id,
 };
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 5e749c528a6..15d037ae25c 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -34,7 +34,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/page-flags.h>
-#include <linux/byteorder/generic.h>
+#include <asm/byteorder.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 771adf47e94..32129f3ea83 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -136,7 +136,7 @@ static const u8 hw_addrs[] = {
 };
 
 /* This array should match the IVTV_HW_ defines */
-static const char * const hw_drivernames[] = {
+static const char * const hw_devicenames[] = {
         "cx25840",
         "saa7115",
         "saa7127",
@@ -145,7 +145,7 @@ static const char * const hw_drivernames[] = {
         "wm8775",
         "cs53l32a",
         "tveeprom",
-        "saa7115",
+        "saa7114",
         "upd64031a",
         "upd64083",
         "saa717x",
@@ -167,8 +167,7 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
                 return -1;
         id = hw_driverids[idx];
         memset(&info, 0, sizeof(info));
-        strlcpy(info.driver_name, hw_drivernames[idx],
-                        sizeof(info.driver_name));
+        strlcpy(info.type, hw_devicenames[idx], sizeof(info.type));
         info.addr = hw_addrs[idx];
         for (i = 0; itv->i2c_clients[i] && i < I2C_CLIENTS_MAX; i++) {}
 
@@ -657,7 +656,7 @@ static const char *ivtv_i2c_id_name(u32 id)
 
         for (i = 0; i < ARRAY_SIZE(hw_driverids); i++)
                 if (hw_driverids[i] == id)
-                        return hw_drivernames[i];
+                        return hw_devicenames[i];
         return "unknown device";
 }
 
@@ -668,7 +667,7 @@ static const char *ivtv_i2c_hw_name(u32 hw)
 
         for (i = 0; i < ARRAY_SIZE(hw_driverids); i++)
                 if (1 << i == hw)
-                        return hw_drivernames[i];
+                        return hw_devicenames[i];
         return "unknown device";
 }
 
@@ -770,7 +769,7 @@ int init_ivtv_i2c(struct ivtv *itv)
          * same size and GPIO must be the last entry.
          */
         if (ARRAY_SIZE(hw_driverids) != ARRAY_SIZE(hw_addrs) ||
-            ARRAY_SIZE(hw_drivernames) != ARRAY_SIZE(hw_addrs) ||
+            ARRAY_SIZE(hw_devicenames) != ARRAY_SIZE(hw_addrs) ||
             IVTV_HW_GPIO != (1 << (ARRAY_SIZE(hw_addrs) - 1)) ||
             hw_driverids[ARRAY_SIZE(hw_addrs) - 1]) {
                 IVTV_ERR("Mismatched I2C hardware arrays\n");
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c
index 5b9dfa2c51b..8e0160d275c 100644
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
@@ -135,8 +135,6 @@ static int m52790_probe(struct i2c_client *client,
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -EIO;
 
-        snprintf(client->name, sizeof(client->name) - 1, "m52790");
-
         v4l_info(client, "chip found @ 0x%x (%s)\n",
                         client->addr << 1, client->adapter->name);
 
@@ -159,11 +157,18 @@ static int m52790_remove(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+static const struct i2c_device_id m52790_id[] = {
+        { "m52790", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, m52790_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "m52790",
         .driverid = I2C_DRIVERID_M52790,
         .command = m52790_command,
         .probe = m52790_probe,
         .remove = m52790_remove,
+        .id_table = m52790_id,
 };
 
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index e6273162e12..310dbaba55f 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -815,7 +815,8 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
         int msp_product, msp_prod_hi, msp_prod_lo;
         int msp_rom;
 
-        snprintf(client->name, sizeof(client->name) - 1, "msp3400");
+        if (!id)
+                strlcpy(client->name, "msp3400", sizeof(client->name));
 
         if (msp_reset(client) == -1) {
                 v4l_dbg(1, msp_debug, client, "msp3400 not found\n");
@@ -864,9 +865,6 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
         msp_revision = (state->rev1 & 0x0f) + '@';
         msp_hard = ((state->rev1 >> 8) & 0xff) + '@';
         msp_rom = state->rev2 & 0x1f;
-        snprintf(client->name, sizeof(client->name), "MSP%d4%02d%c-%c%d",
-                        msp_family, msp_product,
-                        msp_revision, msp_hard, msp_rom);
         /* Rev B=2, C=3, D=4, G=7 */
         state->ident = msp_family * 10000 + 4000 + msp_product * 10 +
                         msp_revision - '@';
@@ -931,7 +929,9 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
         }
 
         /* hello world :-) */
-        v4l_info(client, "%s found @ 0x%x (%s)\n", client->name,
+        v4l_info(client, "MSP%d4%02d%c-%c%d found @ 0x%x (%s)\n",
+                        msp_family, msp_product,
+                        msp_revision, msp_hard, msp_rom,
                         client->addr << 1, client->adapter->name);
         v4l_info(client, "%s ", client->name);
         if (state->has_nicam && state->has_radio)
@@ -987,6 +987,12 @@ static int msp_remove(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+static const struct i2c_device_id msp_id[] = {
+        { "msp3400", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, msp_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "msp3400",
         .driverid = I2C_DRIVERID_MSP3400,
@@ -995,6 +1001,7 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .remove = msp_remove,
         .suspend = msp_suspend,
         .resume = msp_resume,
+        .id_table = msp_id,
 };
 
 
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index e684108637a..435c083cc54 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1456,14 +1456,13 @@ static int saa7115_probe(struct i2c_client *client,
         struct saa711x_state *state;
         int     i;
         char    name[17];
-        u8 chip_id;
+        char chip_id;
+        int autodetect = !id || id->driver_data == 1;
 
         /* Check if the adapter supports the needed features */
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -EIO;
 
-        snprintf(client->name, sizeof(client->name) - 1, "saa7115");
-
         for (i = 0; i < 0x0f; i++) {
                 saa711x_write(client, 0, i);
                 name[i] = (saa711x_read(client, 0) & 0x0f) + '0';
@@ -1472,8 +1471,7 @@ static int saa7115_probe(struct i2c_client *client,
         }
         name[i] = '\0';
 
-        saa711x_write(client, 0, 5);
-        chip_id = saa711x_read(client, 0) & 0x0f;
+        chip_id = name[5];
 
         /* Check whether this chip is part of the saa711x series */
         if (memcmp(name, "1f711", 5)) {
@@ -1482,8 +1480,14 @@ static int saa7115_probe(struct i2c_client *client,
                 return -ENODEV;
         }
 
-        snprintf(client->name, sizeof(client->name) - 1, "saa711%d",chip_id);
-        v4l_info(client, "saa711%d found (%s) @ 0x%x (%s)\n", chip_id, name, client->addr << 1, client->adapter->name);
+        /* Safety check */
+        if (!autodetect && id->name[6] != chip_id) {
+                v4l_warn(client, "found saa711%c while %s was expected\n",
+                         chip_id, id->name);
+        }
+        snprintf(client->name, sizeof(client->name), "saa711%c", chip_id);
+        v4l_info(client, "saa711%c found (%s) @ 0x%x (%s)\n", chip_id, name,
+                 client->addr << 1, client->adapter->name);
 
         state = kzalloc(sizeof(struct saa711x_state), GFP_KERNEL);
         i2c_set_clientdata(client, state);
@@ -1499,19 +1503,19 @@ static int saa7115_probe(struct i2c_client *client,
         state->hue = 0;
         state->sat = 64;
         switch (chip_id) {
-        case 1:
+        case '1':
                 state->ident = V4L2_IDENT_SAA7111;
                 break;
-        case 3:
+        case '3':
                 state->ident = V4L2_IDENT_SAA7113;
                 break;
-        case 4:
+        case '4':
                 state->ident = V4L2_IDENT_SAA7114;
                 break;
-        case 5:
+        case '5':
                 state->ident = V4L2_IDENT_SAA7115;
                 break;
-        case 8:
+        case '8':
                 state->ident = V4L2_IDENT_SAA7118;
                 break;
         default:
@@ -1553,6 +1557,17 @@ static int saa7115_remove(struct i2c_client *client)
         return 0;
 }
 
+static const struct i2c_device_id saa7115_id[] = {
+        { "saa711x", 1 }, /* autodetect */
+        { "saa7111", 0 },
+        { "saa7113", 0 },
+        { "saa7114", 0 },
+        { "saa7115", 0 },
+        { "saa7118", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa7115_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "saa7115",
         .driverid = I2C_DRIVERID_SAA711X,
@@ -1560,5 +1575,6 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .probe = saa7115_probe,
         .remove = saa7115_remove,
         .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
+        .id_table = saa7115_id,
 };
 
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index e750cd65c1c..79d11a658bd 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -672,8 +672,6 @@ static int saa7127_probe(struct i2c_client *client,
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -EIO;
 
-        snprintf(client->name, sizeof(client->name) - 1, "saa7127");
-
         v4l_dbg(1, debug, client, "detecting saa7127 client on address 0x%x\n",
                         client->addr << 1);
 
@@ -741,11 +739,18 @@ static int saa7127_remove(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+static struct i2c_device_id saa7127_id[] = {
+        { "saa7127", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa7127_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "saa7127",
         .driverid = I2C_DRIVERID_SAA7127,
         .command = saa7127_command,
         .probe = saa7127_probe,
         .remove = saa7127_remove,
+        .id_table = saa7127_id,
 };
 
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c
index 72c4081feff..2220f956994 100644
--- a/drivers/media/video/saa717x.c
+++ b/drivers/media/video/saa717x.c
@@ -1429,8 +1429,6 @@ static int saa717x_probe(struct i2c_client *client,
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -EIO;
 
-        snprintf(client->name, sizeof(client->name) - 1, "saa717x");
-
         if (saa717x_write(client, 0x5a4, 0xfe) &&
                         saa717x_write(client, 0x5a5, 0x0f) &&
                         saa717x_write(client, 0x5a6, 0x00) &&
@@ -1507,6 +1505,12 @@ static int saa717x_remove(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+static const struct i2c_device_id saa717x_id[] = {
+        { "saa717x", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa717x_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "saa717x",
         .driverid = I2C_DRIVERID_SAA717X,
@@ -1514,4 +1518,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .probe = saa717x_probe,
         .remove = saa717x_remove,
         .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
+        .id_table = saa717x_id,
 };
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 5748b1e1a12..7f9c7bcf3c8 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -34,7 +34,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/page-flags.h>
-#include <linux/byteorder/generic.h>
+#include <asm/byteorder.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 5a75788b92a..a0f7bc1edaa 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -92,6 +92,7 @@ struct tuner {
         unsigned int        type; /* chip type id */
         unsigned int        config;
         int (*tuner_callback) (void *dev, int command, int arg);
+        const char          *name;
 };
 
 /* standard i2c insmod options */
@@ -330,13 +331,13 @@ static void tuner_i2c_address_check(struct tuner *t)
         tuner_warn("Support for tuners in i2c address range 0x64 thru 0x6f\n");
         tuner_warn("will soon be dropped. This message indicates that your\n");
         tuner_warn("hardware has a %s tuner at i2c address 0x%02x.\n",
-                   t->i2c->name, t->i2c->addr);
+                   t->name, t->i2c->addr);
         tuner_warn("To ensure continued support for your device, please\n");
         tuner_warn("send a copy of this message, along with full dmesg\n");
         tuner_warn("output to v4l-dvb-maintainer@linuxtv.org\n");
         tuner_warn("Please use subject line: \"obsolete tuner i2c address.\"\n");
         tuner_warn("driver: %s, addr: 0x%02x, type: %d (%s)\n",
-                   t->i2c->adapter->name, t->i2c->addr, t->type, t->i2c->name);
+                   t->i2c->adapter->name, t->i2c->addr, t->type, t->name);
         tuner_warn("====================== WARNING! ======================\n");
 }
 
@@ -470,19 +471,17 @@ static void set_type(struct i2c_client *c, unsigned int type,
         if ((NULL == analog_ops->set_params) &&
             (fe_tuner_ops->set_analog_params)) {
 
-                strlcpy(t->i2c->name, fe_tuner_ops->info.name,
-                        sizeof(t->i2c->name));
+                t->name = fe_tuner_ops->info.name;
 
                 t->fe.analog_demod_priv = t;
                 memcpy(analog_ops, &tuner_core_ops,
                        sizeof(struct analog_demod_ops));
 
         } else {
-                strlcpy(t->i2c->name, analog_ops->info.name,
-                        sizeof(t->i2c->name));
+                t->name = analog_ops->info.name;
         }
 
-        tuner_dbg("type set to %s\n", t->i2c->name);
+        tuner_dbg("type set to %s\n", t->name);
 
         if (t->mode_mask == T_UNINITIALIZED)
                 t->mode_mask = new_mode_mask;
@@ -1115,7 +1114,7 @@ static int tuner_probe(struct i2c_client *client,
         if (NULL == t)
                 return -ENOMEM;
         t->i2c = client;
-        strlcpy(client->name, "(tuner unset)", sizeof(client->name));
+        t->name = "(tuner unset)";
         i2c_set_clientdata(client, t);
         t->type = UNSET;
         t->audmode = V4L2_TUNER_MODE_STEREO;
@@ -1278,6 +1277,15 @@ static int tuner_remove(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+/* This driver supports many devices and the idea is to let the driver
+   detect which device is present. So rather than listing all supported
+   devices here, we pretend to support a single, fake device type. */
+static const struct i2c_device_id tuner_id[] = {
+        { "tuner", }, /* autodetect */
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tuner_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tuner",
         .driverid = I2C_DRIVERID_TUNER,
@@ -1287,6 +1295,7 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .suspend = tuner_suspend,
         .resume = tuner_resume,
         .legacy_probe = tuner_legacy_probe,
+        .id_table = tuner_id,
 };
 
 
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index 93bfd19dec7..b4628874933 100644
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -228,6 +228,11 @@ static int upd64031a_remove(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+static const struct i2c_device_id upd64031a_id[] = {
+        { "upd64031a", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, upd64031a_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "upd64031a",
@@ -235,4 +240,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .command = upd64031a_command,
         .probe = upd64031a_probe,
         .remove = upd64031a_remove,
+        .id_table = upd64031a_id,
 };
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index 9ab712a56ce..9521ce004dc 100644
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -205,6 +205,11 @@ static int upd64083_remove(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+static const struct i2c_device_id upd64083_id[] = {
+        { "upd64083", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, upd64083_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "upd64083",
@@ -212,4 +217,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .command = upd64083_command,
         .probe = upd64083_probe,
         .remove = upd64083_remove,
+        .id_table = upd64083_id,
 };
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 982f4463896..0a88c44ace0 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -331,7 +331,7 @@ int videobuf_mmap_free(struct videobuf_queue *q)
 }
 
 /* Locking: Caller holds q->vb_lock */
-static int __videobuf_mmap_setup(struct videobuf_queue *q,
+int __videobuf_mmap_setup(struct videobuf_queue *q,
                         unsigned int bcount, unsigned int bsize,
                         enum v4l2_memory memory)
 {
@@ -1129,6 +1129,7 @@ EXPORT_SYMBOL_GPL(videobuf_read_stream);
 EXPORT_SYMBOL_GPL(videobuf_read_one);
 EXPORT_SYMBOL_GPL(videobuf_poll_stream);
 
+EXPORT_SYMBOL_GPL(__videobuf_mmap_setup);
 EXPORT_SYMBOL_GPL(videobuf_mmap_setup);
 EXPORT_SYMBOL_GPL(videobuf_mmap_free);
 EXPORT_SYMBOL_GPL(videobuf_mmap_mapper);
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c
index fac0deba24a..a1f76ee032e 100644
--- a/drivers/media/video/vp27smpx.c
+++ b/drivers/media/video/vp27smpx.c
@@ -130,8 +130,6 @@ static int vp27smpx_probe(struct i2c_client *client,
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -EIO;
 
-        snprintf(client->name, sizeof(client->name) - 1, "vp27smpx");
-
         v4l_info(client, "chip found @ 0x%x (%s)\n",
                         client->addr << 1, client->adapter->name);
 
@@ -154,11 +152,18 @@ static int vp27smpx_remove(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+static const struct i2c_device_id vp27smpx_id[] = {
+        { "vp27smpx", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, vp27smpx_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "vp27smpx",
         .driverid = I2C_DRIVERID_VP27SMPX,
         .command = vp27smpx_command,
         .probe = vp27smpx_probe,
         .remove = vp27smpx_remove,
+        .id_table = vp27smpx_id,
 };
 
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c
index 0f8ed8461fb..fc50299caa3 100644
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
@@ -313,11 +313,18 @@ static int wm8739_remove(struct i2c_client *client)
         return 0;
 }
 
+static const struct i2c_device_id wm8739_id[] = {
+        { "wm8739", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, wm8739_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "wm8739",
         .driverid = I2C_DRIVERID_WM8739,
         .command = wm8739_command,
         .probe = wm8739_probe,
         .remove = wm8739_remove,
+        .id_table = wm8739_id,
 };
 
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 67a409e60c4..506378a508b 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -216,11 +216,18 @@ static int wm8775_remove(struct i2c_client *client)
         return 0;
 }
 
+static const struct i2c_device_id wm8775_id[] = {
+        { "wm8775", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, wm8775_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "wm8775",
         .driverid = I2C_DRIVERID_WM8775,
         .command = wm8775_command,
         .probe = wm8775_probe,
         .remove = wm8775_remove,
+        .id_table = wm8775_id,
 };
 
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 363dd2b9475..e5c4e9f5193 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -38,7 +38,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/page-flags.h>
-#include <linux/byteorder/generic.h>
+#include <asm/byteorder.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index 7b60533efe4..37629ffd34c 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -31,7 +31,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/vmalloc.h>
-#include <linux/byteorder/generic.h>
 
 #include <linux/interrupt.h>
 #include <linux/proc_fs.h>
@@ -47,6 +46,7 @@
 #include <linux/delay.h>
 #include <linux/wait.h>
 
+#include <asm/byteorder.h>
 #include <asm/io.h>
 
 #include "videocodec.h"
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 0134bec1e39..345c77e4683 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -52,7 +52,6 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/wait.h>
-#include <linux/byteorder/generic.h>
 
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
@@ -74,6 +73,7 @@
 #include <media/v4l2-common.h>
 #include "videocodec.h"
 
+#include <asm/byteorder.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/proc_fs.h>