V4L/DVB (9703): Move the s5k4aa vflip quirk table to the main sensor file in order...

Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index 14b1eac5b812517723e79a9fa910cf061ee6c099..2cb76d0f789c44d814f244522868d658ed767aa9 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -18,6 +18,39 @@
 
 #include "m5602_s5k4aa.h"
 
+static
+    const
+       struct dmi_system_id s5k4aa_vflip_dmi_table[] = {
+       {
+               .ident = "Fujitsu-Siemens Amilo Xa 2528",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xa 2528")
+               }
+       }, {
+               .ident = "Fujitsu-Siemens Amilo Xi 2550",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2550")
+               }
+       }, {
+               .ident = "MSI GX700",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "GX700"),
+                       DMI_MATCH(DMI_BIOS_DATE, "07/26/2007")
+               }
+       }, {
+               .ident = "MSI GX700/GX705/EX700",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "GX700/GX705/EX700")
+               }
+       },
+       { }
+};
+
+
 int s5k4aa_probe(struct sd *sd)
 {
        u8 prod_id[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
index 00e4efd5769a3921bb977e07fd3aab18dfc38ce3..151c6f530e58a6dab0d671b63cd480a383185662 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -338,36 +338,4 @@ static const unsigned char init_s5k4aa[][4] =
        {SENSOR, S5K4AA_GAIN_2, 0xa0, 0x00}
 };
 
-static
-    const
-       struct dmi_system_id s5k4aa_vflip_dmi_table[] = {
-       {
-               .ident = "Fujitsu-Siemens Amilo Xa 2528",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xa 2528")
-               }
-       }, {
-               .ident = "Fujitsu-Siemens Amilo Xi 2550",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2550")
-               }
-       }, {
-               .ident = "MSI GX700",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "GX700"),
-                       DMI_MATCH(DMI_BIOS_DATE, "07/26/2007")
-               }
-       }, {
-               .ident = "MSI GX700/GX705/EX700",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "GX700/GX705/EX700")
-               }
-       },
-       { }
-};
-
 #endif