V4L/DVB (8272): sms1xxx: move driver from media/mdtv/ to media/dvb/siano/

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

10 files changed, 62 insertions, 83 deletions

diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 7b21b49..8bc1445 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -21,6 +21,7 @@ source "drivers/media/dvb/dvb-usb/Kconfig"
 source "drivers/media/dvb/ttusb-budget/Kconfig"
 source "drivers/media/dvb/ttusb-dec/Kconfig"
 source "drivers/media/dvb/cinergyT2/Kconfig"
+source "drivers/media/dvb/siano/Kconfig"
 
 comment "Supported FlexCopII (B2C2) Adapters"
 	depends on DVB_CORE && (PCI || USB) && I2C
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index a7ad084..d6ba4d1 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ cinergyT2/ dvb-usb/ pluto2/
+obj-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 0000000..878d48c
--- /dev/null
+++ b/drivers/media/dvb/siano/Kconfig
@@ -0,0 +1,16 @@
+#
+# Siano Mobile Silicon Digital TV device configuration
+#
+
+config DVB_SIANO_SMS1XXX
+	tristate "Siano SMS1xxx USB dongle support"
+	depends on DVB_CORE && USB
+	---help---
+	  Choose Y here if you have USB dongle with SMS1xxx chipset.
+
+	  Further documentation on this driver can be found on the WWW at
+	  <http://www.siano-ms.com/>.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called sms1xxx.
+
diff --git a/drivers/media/dvb/siano/Makefile b/drivers/media/dvb/siano/Makefile
new file mode 100644
index 0000000..e549c4e
--- /dev/null
+++ b/drivers/media/dvb/siano/Makefile
@@ -0,0 +1,8 @@
+sms1xxx-objs := smscoreapi.o smsusb.o smsdvb.o
+
+obj-$(CONFIG_DVB_SIANO_SMS1XXX) += sms1xxx.o
+
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+
+EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
+
diff --git a/drivers/media/mdtv/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index b261fe2..d3ba1fc 100644
--- a/drivers/media/mdtv/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -1,46 +1,26 @@
-
 /*
- *  Driver for the Siano SMS10xx USB dongle
+ *  Siano core API module
+ *
+ *  This file contains implementation for the interface to sms core component
+ *
+ *  author: Anatoly Greenblat
  *
- *  Copyright (c) 2008 <TODO: INSERT ALL COPYRIGHT OWNERS and MAINT. NAMES HERE>
+ *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation;
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
  *
- *  GNU General Public License for more details.
+ *  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.
  */
 
-/*!
-
-	\file		smscoreapi.c
-
-	\brief		Siano core API module
-				This file contains implementation for the interface to sms core component
-
-    \par 		Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
-
-    \par 		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.
-
-	\author		Anatoly Greenblat
-
-*/
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
diff --git a/drivers/media/mdtv/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
index 53c1d35..679487d 100644
--- a/drivers/media/mdtv/smscoreapi.h
+++ b/drivers/media/dvb/siano/smscoreapi.h
@@ -1,18 +1,18 @@
 /*
- *  Driver for the Siano SMS10xx USB dongle
+ *  Driver for the Siano SMS1xxx USB dongle
  *
- *  Copyright (c) 2008 <TODO: INSERT ALL COPYRIGHT OWNERS and MAINT. NAMES HERE>
+ *  author: Anatoly Greenblat
+ *
+ *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation;
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
  *
- *  GNU General Public License for more details.
+ *  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
diff --git a/drivers/media/mdtv/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index f56658c..e1a14a8 100644
--- a/drivers/media/mdtv/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -1,18 +1,18 @@
 /*
  *  Driver for the Siano SMS10xx USB dongle
  *
- *  Copyright (c) 2008 <TODO: INSERT ALL COPYRIGHT OWNERS and MAINT. NAMES HERE>
+ *  author: Anatoly Greenblat
+ *
+ *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation;
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
  *
- *  GNU General Public License for more details.
+ *  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
diff --git a/drivers/media/mdtv/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index c0f77a3..20aa878 100644
--- a/drivers/media/mdtv/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -1,18 +1,18 @@
 /*
  *  Driver for the Siano SMS10xx USB dongle
  *
- *  Copyright (c) 2008 <TODO: INSERT ALL COPYRIGHT OWNERS and MAINT. NAMES HERE>
+ *  author: Anatoly Greenblat
+ *
+ *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation;
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
  *
- *  GNU General Public License for more details.
+ *  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
diff --git a/drivers/media/mdtv/Kconfig b/drivers/media/mdtv/Kconfig
deleted file mode 100644
index a7faca0..0000000
--- a/drivers/media/mdtv/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Mobile Digital TV device configuration
-#
-
-config MDTV_SIANO_STELLAR_USB
-	tristate "Siano SMS10xx USB dongle support"
-	default m
-	---help---
-	  Choose Y here if you have USB dongle with SMS10xx chipset.
-
-	  Further documentation on this driver can be found on the WWW at
-	  <http://www.siano-ms.com/>.
-
-	  To compile this driver as a module, choose M here: the
-	  modules will be called smschar and smsnet.
-
diff --git a/drivers/media/mdtv/Makefile b/drivers/media/mdtv/Makefile
deleted file mode 100644
index 16b9c48..0000000
--- a/drivers/media/mdtv/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-smscore-objs := smscoreapi.o smsusb.o smsdvb.o
-
-obj-$(CONFIG_MDTV_SIANO_STELLAR_USB) += smscore.o
-
-EXTRA_CFLAGS += -Idrivers/media/video
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
-EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
-
-EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
-