[media] as102: promote it out of staging

This driver is stable and doesn't contain any really serious
issue. Move it out of staging.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index 94d51e092db34a4df56fb49570dd5e2de3af0895..d6e8edc59b6de5acbd797e3e5f722fd5d6475ad7 100644 (file)
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -46,6 +46,7 @@ source "drivers/media/usb/ttusb-budget/Kconfig"
 source "drivers/media/usb/ttusb-dec/Kconfig"
 source "drivers/media/usb/siano/Kconfig"
 source "drivers/media/usb/b2c2/Kconfig"
+source "drivers/media/usb/as102/Kconfig"
 endif
 
 if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT)

diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index f438efffefc59e027a1241fc7a30b42774b416c8..b5b645b91f4ea6ab4e2abc1b07df1591dd3bf5ba 100644 (file)
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -23,3 +23,4 @@ obj-$(CONFIG_VIDEO_TM6000) += tm6000/
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
 obj-$(CONFIG_VIDEO_USBTV) += usbtv/
 obj-$(CONFIG_VIDEO_GO7007) += go7007/
+obj-$(CONFIG_DVB_AS102) += as102/

diff --git a/drivers/staging/media/as102/Kconfig b/drivers/media/usb/as102/Kconfig
similarity index 100%
rename from drivers/staging/media/as102/Kconfig
rename to drivers/media/usb/as102/Kconfig

diff --git a/drivers/staging/media/as102/Makefile b/drivers/media/usb/as102/Makefile
similarity index 100%
rename from drivers/staging/media/as102/Makefile
rename to drivers/media/usb/as102/Makefile

diff --git a/drivers/staging/media/as102/as102_drv.c b/drivers/media/usb/as102/as102_drv.c
similarity index 100%
rename from drivers/staging/media/as102/as102_drv.c
rename to drivers/media/usb/as102/as102_drv.c

diff --git a/drivers/staging/media/as102/as102_drv.h b/drivers/media/usb/as102/as102_drv.h
similarity index 100%
rename from drivers/staging/media/as102/as102_drv.h
rename to drivers/media/usb/as102/as102_drv.h

diff --git a/drivers/staging/media/as102/as102_fe.c b/drivers/media/usb/as102/as102_fe.c
similarity index 100%
rename from drivers/staging/media/as102/as102_fe.c
rename to drivers/media/usb/as102/as102_fe.c

diff --git a/drivers/staging/media/as102/as102_fw.c b/drivers/media/usb/as102/as102_fw.c
similarity index 100%
rename from drivers/staging/media/as102/as102_fw.c
rename to drivers/media/usb/as102/as102_fw.c

diff --git a/drivers/staging/media/as102/as102_fw.h b/drivers/media/usb/as102/as102_fw.h
similarity index 100%
rename from drivers/staging/media/as102/as102_fw.h
rename to drivers/media/usb/as102/as102_fw.h

diff --git a/drivers/staging/media/as102/as102_usb_drv.c b/drivers/media/usb/as102/as102_usb_drv.c
similarity index 100%
rename from drivers/staging/media/as102/as102_usb_drv.c
rename to drivers/media/usb/as102/as102_usb_drv.c

diff --git a/drivers/staging/media/as102/as102_usb_drv.h b/drivers/media/usb/as102/as102_usb_drv.h
similarity index 100%
rename from drivers/staging/media/as102/as102_usb_drv.h
rename to drivers/media/usb/as102/as102_usb_drv.h

diff --git a/drivers/staging/media/as102/as10x_cmd.c b/drivers/media/usb/as102/as10x_cmd.c
similarity index 100%
rename from drivers/staging/media/as102/as10x_cmd.c
rename to drivers/media/usb/as102/as10x_cmd.c

diff --git a/drivers/staging/media/as102/as10x_cmd.h b/drivers/media/usb/as102/as10x_cmd.h
similarity index 100%
rename from drivers/staging/media/as102/as10x_cmd.h
rename to drivers/media/usb/as102/as10x_cmd.h

diff --git a/drivers/staging/media/as102/as10x_cmd_cfg.c b/drivers/media/usb/as102/as10x_cmd_cfg.c
similarity index 100%
rename from drivers/staging/media/as102/as10x_cmd_cfg.c
rename to drivers/media/usb/as102/as10x_cmd_cfg.c

diff --git a/drivers/staging/media/as102/as10x_cmd_stream.c b/drivers/media/usb/as102/as10x_cmd_stream.c
similarity index 100%
rename from drivers/staging/media/as102/as10x_cmd_stream.c
rename to drivers/media/usb/as102/as10x_cmd_stream.c

diff --git a/drivers/staging/media/as102/as10x_handle.h b/drivers/media/usb/as102/as10x_handle.h
similarity index 100%
rename from drivers/staging/media/as102/as10x_handle.h
rename to drivers/media/usb/as102/as10x_handle.h

diff --git a/drivers/staging/media/as102/as10x_types.h b/drivers/media/usb/as102/as10x_types.h
similarity index 100%
rename from drivers/staging/media/as102/as10x_types.h
rename to drivers/media/usb/as102/as10x_types.h

diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 3323eb5e77b07ea1e56367c21ff9497e2143f661..655cf5037b0b9f2d5e2e88f4dc37ee399bf21d95 100644 (file)
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -19,8 +19,6 @@ menuconfig STAGING_MEDIA
 if STAGING_MEDIA
 
 # Please keep them in alphabetic order
-source "drivers/staging/media/as102/Kconfig"
-
 source "drivers/staging/media/bcm2048/Kconfig"
 
 source "drivers/staging/media/cxd2099/Kconfig"

diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 7db83f373f63010c8618255415146c9a1d9dd03e..6dbe578178cdcdbb4d988809c40c3241a36816a2 100644 (file)
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_DVB_AS102)                += as102/
 obj-$(CONFIG_I2C_BCM2048)      += bcm2048/
 obj-$(CONFIG_DVB_CXD2099)      += cxd2099/
 obj-$(CONFIG_LIRC_STAGING)     += lirc/