diff options
-rw-r--r-- | drivers/media/usb/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/usb/Makefile | 1 | ||||
-rw-r--r-- | drivers/media/usb/as102/Kconfig (renamed from drivers/staging/media/as102/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/Makefile (renamed from drivers/staging/media/as102/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as102_drv.c (renamed from drivers/staging/media/as102/as102_drv.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as102_drv.h (renamed from drivers/staging/media/as102/as102_drv.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as102_fe.c (renamed from drivers/staging/media/as102/as102_fe.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as102_fw.c (renamed from drivers/staging/media/as102/as102_fw.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as102_fw.h (renamed from drivers/staging/media/as102/as102_fw.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as102_usb_drv.c (renamed from drivers/staging/media/as102/as102_usb_drv.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as102_usb_drv.h (renamed from drivers/staging/media/as102/as102_usb_drv.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as10x_cmd.c (renamed from drivers/staging/media/as102/as10x_cmd.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as10x_cmd.h (renamed from drivers/staging/media/as102/as10x_cmd.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as10x_cmd_cfg.c (renamed from drivers/staging/media/as102/as10x_cmd_cfg.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as10x_cmd_stream.c (renamed from drivers/staging/media/as102/as10x_cmd_stream.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as10x_handle.h (renamed from drivers/staging/media/as102/as10x_handle.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/as102/as10x_types.h (renamed from drivers/staging/media/as102/as10x_types.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/media/Makefile | 1 |
19 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index 94d51e0..d6e8edc 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 f438eff..b5b645b 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 index 28aba00..28aba00 100644 --- a/drivers/staging/media/as102/Kconfig +++ b/drivers/media/usb/as102/Kconfig diff --git a/drivers/staging/media/as102/Makefile b/drivers/media/usb/as102/Makefile index 8916d8a..8916d8a 100644 --- a/drivers/staging/media/as102/Makefile +++ b/drivers/media/usb/as102/Makefile diff --git a/drivers/staging/media/as102/as102_drv.c b/drivers/media/usb/as102/as102_drv.c index e0ee618..e0ee618 100644 --- a/drivers/staging/media/as102/as102_drv.c +++ b/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 index 49d0c42..49d0c42 100644 --- a/drivers/staging/media/as102/as102_drv.h +++ b/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 index 67e55b8..67e55b8 100644 --- a/drivers/staging/media/as102/as102_fe.c +++ b/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 index f33f752..f33f752 100644 --- a/drivers/staging/media/as102/as102_fw.c +++ b/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 index 4bfc684..4bfc684 100644 --- a/drivers/staging/media/as102/as102_fw.h +++ b/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 index 86f83b9..86f83b9 100644 --- a/drivers/staging/media/as102/as102_usb_drv.c +++ b/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 index 1ad1ec5..1ad1ec5 100644 --- a/drivers/staging/media/as102/as102_usb_drv.h +++ b/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 index 9e49f15..9e49f15 100644 --- a/drivers/staging/media/as102/as10x_cmd.c +++ b/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 index e21ec6c..e21ec6c 100644 --- a/drivers/staging/media/as102/as10x_cmd.h +++ b/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 index b1e300d..b1e300d 100644 --- a/drivers/staging/media/as102/as10x_cmd_cfg.c +++ b/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 index 1088ca1..1088ca1 100644 --- a/drivers/staging/media/as102/as10x_cmd_stream.c +++ b/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 index 5638b19..5638b19 100644 --- a/drivers/staging/media/as102/as10x_handle.h +++ b/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 index af26e05..af26e05 100644 --- a/drivers/staging/media/as102/as10x_types.h +++ b/drivers/media/usb/as102/as10x_types.h diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 3323eb5..655cf50 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 7db83f3..6dbe578 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/ |