[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>
git-mirror · Aug 21, 2014 · d6317c6 · d6317c6
1 parent 2179de6
commit d6317c6
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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 → drivers/media/usb/as102/Kconfig b/drivers/staging/media/as102/Kconfig → drivers/media/usb/as102/Kconfig
diff --git a/drivers/staging/media/as102/Makefile → drivers/media/usb/as102/Makefile b/drivers/staging/media/as102/Makefile → drivers/media/usb/as102/Makefile
diff --git a/drivers/staging/media/as102/as102_drv.c → drivers/media/usb/as102/as102_drv.c b/drivers/staging/media/as102/as102_drv.c → drivers/media/usb/as102/as102_drv.c
diff --git a/drivers/staging/media/as102/as102_drv.h → drivers/media/usb/as102/as102_drv.h b/drivers/staging/media/as102/as102_drv.h → drivers/media/usb/as102/as102_drv.h
diff --git a/drivers/staging/media/as102/as102_fe.c → drivers/media/usb/as102/as102_fe.c b/drivers/staging/media/as102/as102_fe.c → drivers/media/usb/as102/as102_fe.c
diff --git a/drivers/staging/media/as102/as102_fw.c → drivers/media/usb/as102/as102_fw.c b/drivers/staging/media/as102/as102_fw.c → drivers/media/usb/as102/as102_fw.c
diff --git a/drivers/staging/media/as102/as102_fw.h → drivers/media/usb/as102/as102_fw.h b/drivers/staging/media/as102/as102_fw.h → drivers/media/usb/as102/as102_fw.h
diff --git a/drivers/staging/media/as102/as102_usb_drv.c → drivers/media/usb/as102/as102_usb_drv.c b/drivers/staging/media/as102/as102_usb_drv.c → drivers/media/usb/as102/as102_usb_drv.c
diff --git a/drivers/staging/media/as102/as102_usb_drv.h → drivers/media/usb/as102/as102_usb_drv.h b/drivers/staging/media/as102/as102_usb_drv.h → drivers/media/usb/as102/as102_usb_drv.h
diff --git a/drivers/staging/media/as102/as10x_cmd.c → drivers/media/usb/as102/as10x_cmd.c b/drivers/staging/media/as102/as10x_cmd.c → drivers/media/usb/as102/as10x_cmd.c
diff --git a/drivers/staging/media/as102/as10x_cmd.h → drivers/media/usb/as102/as10x_cmd.h b/drivers/staging/media/as102/as10x_cmd.h → drivers/media/usb/as102/as10x_cmd.h
diff --git a/drivers/staging/media/as102/as10x_cmd_cfg.c → drivers/media/usb/as102/as10x_cmd_cfg.c b/drivers/staging/media/as102/as10x_cmd_cfg.c → drivers/media/usb/as102/as10x_cmd_cfg.c
diff --git a/...rs/staging/media/as102/as10x_cmd_stream.c → drivers/media/usb/as102/as10x_cmd_stream.c b/...rs/staging/media/as102/as10x_cmd_stream.c → drivers/media/usb/as102/as10x_cmd_stream.c
diff --git a/drivers/staging/media/as102/as10x_handle.h → drivers/media/usb/as102/as10x_handle.h b/drivers/staging/media/as102/as10x_handle.h → drivers/media/usb/as102/as10x_handle.h
diff --git a/drivers/staging/media/as102/as10x_types.h → drivers/media/usb/as102/as10x_types.h b/drivers/staging/media/as102/as10x_types.h → drivers/media/usb/as102/as10x_types.h
diff --git 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
@@ -1,4 +1,3 @@
-obj-$(CONFIG_DVB_AS102)		+= as102/
 obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/