Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (277 commits)
  V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms.
  V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups
  V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernels
  V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warnings
  V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends on
  V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C
  V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c
  V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper places
  V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUF
  V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on"
  V4L/DVB (8390): videodev: add comment and remove magic number.
  V4L/DVB (8389): videodev: simplify get_index()
  V4L/DVB (8387): Some cosmetic changes
  V4L/DVB (8381): ov7670: fix compile warnings
  V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the autodetect driver name.
  V4L/DVB (8379): saa7127: Make device detection optional
  V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setup
  V4L/DVB (8377): ivtv/cx18: ensure the default control values are correct
  V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setup
  V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver.
  ...

1 files changed, 102 insertions, 0 deletions

diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
new file mode 100644
index 000000000000..e7a8ac0c4049
--- /dev/null
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -0,0 +1,102 @@
+/*
+ *  Card-specific functions for the Siano SMS1xxx USB dongle
+ *
+ *  Copyright (c) 2008 Michael Krufky <mkrufky@linuxtv.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation;
+ *
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ *
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "sms-cards.h"
+
+struct usb_device_id smsusb_id_table[] = {
+#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS
+        { USB_DEVICE(0x187f, 0x0010),
+                .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
+        { USB_DEVICE(0x187f, 0x0100),
+                .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
+        { USB_DEVICE(0x187f, 0x0200),
+                .driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },
+        { USB_DEVICE(0x187f, 0x0201),
+                .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
+        { USB_DEVICE(0x187f, 0x0300),
+                .driver_info = SMS1XXX_BOARD_SIANO_VEGA },
+#endif
+        { USB_DEVICE(0x2040, 0x1700),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT },
+        { USB_DEVICE(0x2040, 0x1800),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A },
+        { USB_DEVICE(0x2040, 0x1801),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B },
+        { USB_DEVICE(0x2040, 0x5500),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+        { USB_DEVICE(0x2040, 0x5580),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+        { USB_DEVICE(0x2040, 0x5590),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, smsusb_id_table);
+
+static struct sms_board sms_boards[] = {
+        [SMS_BOARD_UNKNOWN] = {
+                .name   = "Unknown board",
+        },
+        [SMS1XXX_BOARD_SIANO_STELLAR] = {
+                .name   = "Siano Stellar Digital Receiver",
+                .type   = SMS_STELLAR,
+                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-stellar-dvbt-01.fw",
+        },
+        [SMS1XXX_BOARD_SIANO_NOVA_A] = {
+                .name   = "Siano Nova A Digital Receiver",
+                .type   = SMS_NOVA_A0,
+                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-a-dvbt-01.fw",
+        },
+        [SMS1XXX_BOARD_SIANO_NOVA_B] = {
+                .name   = "Siano Nova B Digital Receiver",
+                .type   = SMS_NOVA_B0,
+                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-b-dvbt-01.fw",
+        },
+        [SMS1XXX_BOARD_SIANO_VEGA] = {
+                .name   = "Siano Vega Digital Receiver",
+                .type   = SMS_VEGA,
+        },
+        [SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT] = {
+                .name   = "Hauppauge Catamount",
+                .type   = SMS_STELLAR,
+                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-stellar-dvbt-01.fw",
+        },
+        [SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A] = {
+                .name   = "Hauppauge Okemo-A",
+                .type   = SMS_NOVA_A0,
+                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-a-dvbt-01.fw",
+        },
+        [SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B] = {
+                .name   = "Hauppauge Okemo-B",
+                .type   = SMS_NOVA_B0,
+                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-b-dvbt-01.fw",
+        },
+        [SMS1XXX_BOARD_HAUPPAUGE_WINDHAM] = {
+                .name   = "Hauppauge WinTV-Nova-T-MiniStick",
+                .type   = SMS_NOVA_B0,
+                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-01.fw",
+        },
+};
+
+struct sms_board *sms_get_board(int id)
+{
+        BUG_ON(id >= ARRAY_SIZE(sms_boards));
+
+        return &sms_boards[id];
+}
+