From d6317c68f3324e086799e12e4864231bb71829cb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 12 Aug 2014 18:50:15 -0300 Subject: [PATCH] [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 --- drivers/media/usb/Kconfig | 1 + drivers/media/usb/Makefile | 1 + drivers/{staging/media => media/usb}/as102/Kconfig | 0 drivers/{staging/media => media/usb}/as102/Makefile | 0 drivers/{staging/media => media/usb}/as102/as102_drv.c | 0 drivers/{staging/media => media/usb}/as102/as102_drv.h | 0 drivers/{staging/media => media/usb}/as102/as102_fe.c | 0 drivers/{staging/media => media/usb}/as102/as102_fw.c | 0 drivers/{staging/media => media/usb}/as102/as102_fw.h | 0 drivers/{staging/media => media/usb}/as102/as102_usb_drv.c | 0 drivers/{staging/media => media/usb}/as102/as102_usb_drv.h | 0 drivers/{staging/media => media/usb}/as102/as10x_cmd.c | 0 drivers/{staging/media => media/usb}/as102/as10x_cmd.h | 0 drivers/{staging/media => media/usb}/as102/as10x_cmd_cfg.c | 0 drivers/{staging/media => media/usb}/as102/as10x_cmd_stream.c | 0 drivers/{staging/media => media/usb}/as102/as10x_handle.h | 0 drivers/{staging/media => media/usb}/as102/as10x_types.h | 0 drivers/staging/media/Kconfig | 2 -- drivers/staging/media/Makefile | 1 - 19 files changed, 2 insertions(+), 3 deletions(-) rename drivers/{staging/media => media/usb}/as102/Kconfig (100%) rename drivers/{staging/media => media/usb}/as102/Makefile (100%) rename drivers/{staging/media => media/usb}/as102/as102_drv.c (100%) rename drivers/{staging/media => media/usb}/as102/as102_drv.h (100%) rename drivers/{staging/media => media/usb}/as102/as102_fe.c (100%) rename drivers/{staging/media => media/usb}/as102/as102_fw.c (100%) rename drivers/{staging/media => media/usb}/as102/as102_fw.h (100%) rename drivers/{staging/media => media/usb}/as102/as102_usb_drv.c (100%) rename drivers/{staging/media => media/usb}/as102/as102_usb_drv.h (100%) rename drivers/{staging/media => media/usb}/as102/as10x_cmd.c (100%) rename drivers/{staging/media => media/usb}/as102/as10x_cmd.h (100%) rename drivers/{staging/media => media/usb}/as102/as10x_cmd_cfg.c (100%) rename drivers/{staging/media => media/usb}/as102/as10x_cmd_stream.c (100%) rename drivers/{staging/media => media/usb}/as102/as10x_handle.h (100%) rename drivers/{staging/media => media/usb}/as102/as10x_types.h (100%) diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index 94d51e092db3..d6e8edc59b6d 100644 --- 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 f438efffefc5..b5b645b91f4e 100644 --- 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 3323eb5e77b0..655cf5037b0b 100644 --- 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 7db83f373f63..6dbe578178cd 100644 --- 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/ -- 2.20.1