[media] move analog PCI saa7146 drivers to its own dir

Instead of having them under drivers/media/video, move them
to their own directory.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

9 files changed, 47 insertions, 42 deletions

diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index b69cb1280f35..e1a9e1afd72c 100644
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -9,6 +9,7 @@ if MEDIA_ANALOG_TV_SUPPORT
         comment "Media capture/analog TV support"
 source "drivers/media/pci/ivtv/Kconfig"
 source "drivers/media/pci/zoran/Kconfig"
+source "drivers/media/pci/saa7146/Kconfig"
 endif
 
 if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
@@ -20,6 +21,7 @@ source "drivers/media/pci/cx88/Kconfig"
 source "drivers/media/pci/bt8xx/Kconfig"
 source "drivers/media/pci/saa7134/Kconfig"
 source "drivers/media/pci/saa7164/Kconfig"
+
 endif
 
 if MEDIA_DIGITAL_TV_SUPPORT
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index d47c222e6949..bb71e30b9d25 100644
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -10,7 +10,8 @@ obj-y        :=	ttpci/		\
                 mantis/         \
                 ngene/          \
                 ddbridge/       \
-                b2c2/
+                b2c2/           \
+                saa7146/
 
 obj-$(CONFIG_VIDEO_IVTV) += ivtv/
 obj-$(CONFIG_VIDEO_ZORAN) += zoran/
diff --git a/drivers/media/pci/saa7146/Kconfig b/drivers/media/pci/saa7146/Kconfig
new file mode 100644
index 000000000000..8923b762bbab
--- /dev/null
+++ b/drivers/media/pci/saa7146/Kconfig
@@ -0,0 +1,38 @@
+config VIDEO_HEXIUM_GEMINI
+        tristate "Hexium Gemini frame grabber"
+        depends on PCI && VIDEO_V4L2 && I2C
+        select VIDEO_SAA7146_VV
+        ---help---
+          This is a video4linux driver for the Hexium Gemini frame
+          grabber card by Hexium. Please note that the Gemini Dual
+          card is *not* fully supported.
+
+          To compile this driver as a module, choose M here: the
+          module will be called hexium_gemini.
+
+config VIDEO_HEXIUM_ORION
+        tristate "Hexium HV-PCI6 and Orion frame grabber"
+        depends on PCI && VIDEO_V4L2 && I2C
+        select VIDEO_SAA7146_VV
+        ---help---
+          This is a video4linux driver for the Hexium HV-PCI6 and
+          Orion frame grabber cards by Hexium.
+
+          To compile this driver as a module, choose M here: the
+          module will be called hexium_orion.
+
+config VIDEO_MXB
+        tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
+        depends on PCI && VIDEO_V4L2 && I2C
+        select VIDEO_SAA7146_VV
+        select VIDEO_TUNER
+        select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO
+        ---help---
+          This is a video4linux driver for the 'Multimedia eXtension Board'
+          TV card by Siemens-Nixdorf.
+
+          To compile this driver as a module, choose M here: the
+          module will be called mxb.
diff --git a/drivers/media/pci/saa7146/Makefile b/drivers/media/pci/saa7146/Makefile
new file mode 100644
index 000000000000..362a38b96308
--- /dev/null
+++ b/drivers/media/pci/saa7146/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_VIDEO_MXB) += mxb.o
+obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
+obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
+
+ccflags-y += -I$(srctree)/drivers/media/video
diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/pci/saa7146/hexium_gemini.c
index 366434f5647e..366434f5647e 100644
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/pci/saa7146/hexium_gemini.c
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/pci/saa7146/hexium_orion.c
index a1eb26d11070..a1eb26d11070 100644
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/pci/saa7146/hexium_orion.c
diff --git a/drivers/media/video/mxb.c b/drivers/media/pci/saa7146/mxb.c
index b520a45cb3f3..b520a45cb3f3 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/pci/saa7146/mxb.c
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index a8371948d184..4d79dfd452b8 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -619,29 +619,6 @@ menuconfig V4L_PCI_DRIVERS
 
 if V4L_PCI_DRIVERS
 
-config VIDEO_HEXIUM_GEMINI
-        tristate "Hexium Gemini frame grabber"
-        depends on PCI && VIDEO_V4L2 && I2C
-        select VIDEO_SAA7146_VV
-        ---help---
-          This is a video4linux driver for the Hexium Gemini frame
-          grabber card by Hexium. Please note that the Gemini Dual
-          card is *not* fully supported.
-
-          To compile this driver as a module, choose M here: the
-          module will be called hexium_gemini.
-
-config VIDEO_HEXIUM_ORION
-        tristate "Hexium HV-PCI6 and Orion frame grabber"
-        depends on PCI && VIDEO_V4L2 && I2C
-        select VIDEO_SAA7146_VV
-        ---help---
-          This is a video4linux driver for the Hexium HV-PCI6 and
-          Orion frame grabber cards by Hexium.
-
-          To compile this driver as a module, choose M here: the
-          module will be called hexium_orion.
-
 config VIDEO_MEYE
         tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
         depends on PCI && SONY_LAPTOP && VIDEO_V4L2
@@ -656,21 +633,6 @@ config VIDEO_MEYE
           To compile this driver as a module, choose M here: the
           module will be called meye.
 
-config VIDEO_MXB
-        tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
-        depends on PCI && VIDEO_V4L2 && I2C
-        select VIDEO_SAA7146_VV
-        select VIDEO_TUNER
-        select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO
-        ---help---
-          This is a video4linux driver for the 'Multimedia eXtension Board'
-          TV card by Siemens-Nixdorf.
-
-          To compile this driver as a module, choose M here: the
-          module will be called mxb.
 
 
 config STA2X11_VIP
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 322a15962607..8df694dde564 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -93,9 +93,6 @@ obj-$(CONFIG_VIDEO_W9966) += w9966.o
 obj-$(CONFIG_VIDEO_PMS) += pms.o
 obj-$(CONFIG_VIDEO_VINO) += vino.o
 obj-$(CONFIG_VIDEO_MEYE) += meye.o
-obj-$(CONFIG_VIDEO_MXB) += mxb.o
-obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
-obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
 obj-$(CONFIG_STA2X11_VIP) += sta2x11_vip.o
 obj-$(CONFIG_VIDEO_TIMBERDALE)  += timblogiw.o