aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/Kconfig1
-rw-r--r--drivers/media/dvb/Makefile2
-rw-r--r--drivers/media/dvb/siano/Kconfig16
-rw-r--r--drivers/media/dvb/siano/Makefile8
-rw-r--r--drivers/media/dvb/siano/smscoreapi.c (renamed from drivers/media/mdtv/smscoreapi.c)42
-rw-r--r--drivers/media/dvb/siano/smscoreapi.h (renamed from drivers/media/mdtv/smscoreapi.h)18
-rw-r--r--drivers/media/dvb/siano/smsdvb.c (renamed from drivers/media/mdtv/smsdvb.c)16
-rw-r--r--drivers/media/dvb/siano/smsusb.c (renamed from drivers/media/mdtv/smsusb.c)16
-rw-r--r--drivers/media/mdtv/Kconfig16
-rw-r--r--drivers/media/mdtv/Makefile10
10 files changed, 62 insertions, 83 deletions
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 7b21b49f1945..8bc1445bd33b 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -21,6 +21,7 @@ source "drivers/media/dvb/dvb-usb/Kconfig"
21source "drivers/media/dvb/ttusb-budget/Kconfig" 21source "drivers/media/dvb/ttusb-budget/Kconfig"
22source "drivers/media/dvb/ttusb-dec/Kconfig" 22source "drivers/media/dvb/ttusb-dec/Kconfig"
23source "drivers/media/dvb/cinergyT2/Kconfig" 23source "drivers/media/dvb/cinergyT2/Kconfig"
24source "drivers/media/dvb/siano/Kconfig"
24 25
25comment "Supported FlexCopII (B2C2) Adapters" 26comment "Supported FlexCopII (B2C2) Adapters"
26 depends on DVB_CORE && (PCI || USB) && I2C 27 depends on DVB_CORE && (PCI || USB) && I2C
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index a7ad0841e6fc..d6ba4d195201 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -2,4 +2,4 @@
2# Makefile for the kernel multimedia device drivers. 2# Makefile for the kernel multimedia device drivers.
3# 3#
4 4
5obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ cinergyT2/ dvb-usb/ pluto2/ 5obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ cinergyT2/ dvb-usb/ pluto2/ siano/
diff --git a/drivers/media/dvb/siano/Kconfig b/drivers/media/dvb/siano/Kconfig
new file mode 100644
index 000000000000..878d48c1cfc0
--- /dev/null
+++ b/drivers/media/dvb/siano/Kconfig
@@ -0,0 +1,16 @@
1#
2# Siano Mobile Silicon Digital TV device configuration
3#
4
5config DVB_SIANO_SMS1XXX
6 tristate "Siano SMS1xxx USB dongle support"
7 depends on DVB_CORE && USB
8 ---help---
9 Choose Y here if you have USB dongle with SMS1xxx chipset.
10
11 Further documentation on this driver can be found on the WWW at
12 <http://www.siano-ms.com/>.
13
14 To compile this driver as a module, choose M here: the
15 module will be called sms1xxx.
16
diff --git a/drivers/media/dvb/siano/Makefile b/drivers/media/dvb/siano/Makefile
new file mode 100644
index 000000000000..e549c4e2bbe2
--- /dev/null
+++ b/drivers/media/dvb/siano/Makefile
@@ -0,0 +1,8 @@
1sms1xxx-objs := smscoreapi.o smsusb.o smsdvb.o
2
3obj-$(CONFIG_DVB_SIANO_SMS1XXX) += sms1xxx.o
4
5EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
6
7EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
8
diff --git a/drivers/media/mdtv/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index b261fe2cee5e..d3ba1fcde54a 100644
--- a/drivers/media/mdtv/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -1,46 +1,26 @@
1
2/* 1/*
3 * Driver for the Siano SMS10xx USB dongle 2 * Siano core API module
3 *
4 * This file contains implementation for the interface to sms core component
5 *
6 * author: Anatoly Greenblat
4 * 7 *
5 * Copyright (c) 2008 <TODO: INSERT ALL COPYRIGHT OWNERS and MAINT. NAMES HERE> 8 * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
6 * 9 *
7 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License version 3 as
9 * the Free Software Foundation; either version 2 of the License, or 12 * published by the Free Software Foundation;
10 * (at your option) any later version.
11 * 13 *
12 * This program is distributed in the hope that it will be useful, 14 * Software distributed under the License is distributed on an "AS IS"
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * 16 *
16 * GNU General Public License for more details. 17 * See the GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 20 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 */ 22 */
22 23
23/*!
24
25 \file smscoreapi.c
26
27 \brief Siano core API module
28 This file contains implementation for the interface to sms core component
29
30 \par Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
31
32 \par This program is free software; you can redistribute it and/or modify
33 it under the terms of the GNU General Public License version 3 as
34 published by the Free Software Foundation;
35
36 Software distributed under the License is distributed on an "AS
37 IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
38 implied.
39
40 \author Anatoly Greenblat
41
42*/
43
44#include <linux/kernel.h> 24#include <linux/kernel.h>
45#include <linux/init.h> 25#include <linux/init.h>
46#include <linux/module.h> 26#include <linux/module.h>
diff --git a/drivers/media/mdtv/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
index 53c1d35da68f..679487df8a53 100644
--- a/drivers/media/mdtv/smscoreapi.h
+++ b/drivers/media/dvb/siano/smscoreapi.h
@@ -1,18 +1,18 @@
1/* 1/*
2 * Driver for the Siano SMS10xx USB dongle 2 * Driver for the Siano SMS1xxx USB dongle
3 * 3 *
4 * Copyright (c) 2008 <TODO: INSERT ALL COPYRIGHT OWNERS and MAINT. NAMES HERE> 4 * author: Anatoly Greenblat
5 *
6 * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
5 * 7 *
6 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License version 3 as
8 * the Free Software Foundation; either version 2 of the License, or 10 * published by the Free Software Foundation;
9 * (at your option) any later version.
10 * 11 *
11 * This program is distributed in the hope that it will be useful, 12 * Software distributed under the License is distributed on an "AS IS"
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * 14 *
15 * GNU General Public License for more details. 15 * See the GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
diff --git a/drivers/media/mdtv/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index f56658c5599d..e1a14a812c25 100644
--- a/drivers/media/mdtv/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -1,18 +1,18 @@
1/* 1/*
2 * Driver for the Siano SMS10xx USB dongle 2 * Driver for the Siano SMS10xx USB dongle
3 * 3 *
4 * Copyright (c) 2008 <TODO: INSERT ALL COPYRIGHT OWNERS and MAINT. NAMES HERE> 4 * author: Anatoly Greenblat
5 *
6 * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
5 * 7 *
6 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License version 3 as
8 * the Free Software Foundation; either version 2 of the License, or 10 * published by the Free Software Foundation;
9 * (at your option) any later version.
10 * 11 *
11 * This program is distributed in the hope that it will be useful, 12 * Software distributed under the License is distributed on an "AS IS"
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * 14 *
15 * GNU General Public License for more details. 15 * See the GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
diff --git a/drivers/media/mdtv/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index c0f77a328ca9..20aa878d9d5f 100644
--- a/drivers/media/mdtv/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -1,18 +1,18 @@
1/* 1/*
2 * Driver for the Siano SMS10xx USB dongle 2 * Driver for the Siano SMS10xx USB dongle
3 * 3 *
4 * Copyright (c) 2008 <TODO: INSERT ALL COPYRIGHT OWNERS and MAINT. NAMES HERE> 4 * author: Anatoly Greenblat
5 *
6 * Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
5 * 7 *
6 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License version 3 as
8 * the Free Software Foundation; either version 2 of the License, or 10 * published by the Free Software Foundation;
9 * (at your option) any later version.
10 * 11 *
11 * This program is distributed in the hope that it will be useful, 12 * Software distributed under the License is distributed on an "AS IS"
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * 14 *
15 * GNU General Public License for more details. 15 * See the GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
diff --git a/drivers/media/mdtv/Kconfig b/drivers/media/mdtv/Kconfig
deleted file mode 100644
index a7faca0b7020..000000000000
--- a/drivers/media/mdtv/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
1#
2# Mobile Digital TV device configuration
3#
4
5config MDTV_SIANO_STELLAR_USB
6 tristate "Siano SMS10xx USB dongle support"
7 default m
8 ---help---
9 Choose Y here if you have USB dongle with SMS10xx chipset.
10
11 Further documentation on this driver can be found on the WWW at
12 <http://www.siano-ms.com/>.
13
14 To compile this driver as a module, choose M here: the
15 modules will be called smschar and smsnet.
16
diff --git a/drivers/media/mdtv/Makefile b/drivers/media/mdtv/Makefile
deleted file mode 100644
index 16b9c488c9d1..000000000000
--- a/drivers/media/mdtv/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
1smscore-objs := smscoreapi.o smsusb.o smsdvb.o
2
3obj-$(CONFIG_MDTV_SIANO_STELLAR_USB) += smscore.o
4
5EXTRA_CFLAGS += -Idrivers/media/video
6EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
7EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
8
9EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
10
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-15 05:18:34 -0500