2 files changed, 36 insertions, 0 deletions

diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index c75c27c18b12..e7a8ac0c4049 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -32,6 +32,18 @@ struct usb_device_id smsusb_id_table[] = {
         { 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);
@@ -59,6 +71,26 @@ static struct sms_board sms_boards[] = {
                 .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)
diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/dvb/siano/sms-cards.h
index 262e3ffbc29c..83b39bc203fe 100644
--- a/drivers/media/dvb/siano/sms-cards.h
+++ b/drivers/media/dvb/siano/sms-cards.h
@@ -28,6 +28,10 @@
 #define SMS1XXX_BOARD_SIANO_NOVA_A  2
 #define SMS1XXX_BOARD_SIANO_NOVA_B  3
 #define SMS1XXX_BOARD_SIANO_VEGA    4
+#define SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT 5
+#define SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A 6
+#define SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B 7
+#define SMS1XXX_BOARD_HAUPPAUGE_WINDHAM 8
 
 struct sms_board {
         enum sms_device_type_st type;