summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-15 14:04:12 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-15 14:04:12 -0300
commit3ed49e67d21dc68e7045fea44d8d3c1df96e85db (patch)
tree0f10d91c2ac07637ceee8b0d76de9d43236420ba /linux/drivers/media/video
parent136a9b83fb4cb819c2f27cbb5948d26cec0e7934 (diff)
parentb2a81d5ecbfe7db00ab13b0bc425d15d3c29ed85 (diff)
downloadmediapointer-dvb-s2-3ed49e67d21dc68e7045fea44d8d3c1df96e85db.tar.gz
mediapointer-dvb-s2-3ed49e67d21dc68e7045fea44d8d3c1df96e85db.tar.bz2
merge: http://linuxtv.org/hg/~eandren/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index 1dd7c161f..38a56294d 100644
--- a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -49,6 +49,12 @@ static
DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2550")
}
}, {
+ .ident = "Fujitsu-Siemens Amilo Pa 2548",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 2548")
+ }
+ }, {
.ident = "MSI GX700",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
@@ -56,6 +62,13 @@ static
DMI_MATCH(DMI_BIOS_DATE, "07/26/2007")
}
}, {
+ .ident = "MSI GX700",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "GX700"),
+ DMI_MATCH(DMI_BIOS_DATE, "07/19/2007")
+ }
+ }, {
.ident = "MSI GX700/GX705/EX700",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),