diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-07-18 04:42:24 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-22 04:01:54 +0400 |
| commit | f3e775962ccbc62bd93f2200b82db88af05d0137 (patch) | |
| tree | 02b661fadf96abf7168f7110e4e9be5170af4b12 | |
| parent | eb83eab7fec5a5137e95717188e57310a0ebc051 (diff) | |
| download | linux-f3e775962ccbc62bd93f2200b82db88af05d0137.tar.xz | |
[media] airspy: move out of staging into drivers/media/usb
Move it out of staging into media like all the other SDR drivers
too. There is no good reasons to keep these SDR drivers in staging.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | drivers/media/usb/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/media/usb/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/usb/airspy/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/media/usb/airspy/Makefile (renamed from drivers/staging/media/airspy/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/media/usb/airspy/airspy.c (renamed from drivers/staging/media/airspy/airspy.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/staging/media/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/media/airspy/Kconfig | 5 |
8 files changed, 12 insertions, 7 deletions
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index f8c1099f5ee8..38b6fe108fcf 100644 --- a/drivers/media/usb/Kconfig +++ b/drivers/media/usb/Kconfig @@ -54,6 +54,7 @@ endif if MEDIA_SDR_SUPPORT comment "Software defined radio USB devices" +source "drivers/media/usb/airspy/Kconfig" endif endif #MEDIA_USB_SUPPORT diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile index 7ac4b143dce8..05d69c282e1f 100644 --- a/drivers/media/usb/Makefile +++ b/drivers/media/usb/Makefile @@ -9,6 +9,7 @@ obj-y += zr364xx/ stkwebcam/ s2255/ obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ obj-$(CONFIG_USB_GSPCA) += gspca/ obj-$(CONFIG_USB_PWC) += pwc/ +obj-$(CONFIG_USB_AIRSPY) += airspy/ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ obj-$(CONFIG_VIDEO_AU0828) += au0828/ obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/ diff --git a/drivers/media/usb/airspy/Kconfig b/drivers/media/usb/airspy/Kconfig new file mode 100644 index 000000000000..10b204cf4dbc --- /dev/null +++ b/drivers/media/usb/airspy/Kconfig @@ -0,0 +1,10 @@ +config USB_AIRSPY + tristate "AirSpy" + depends on VIDEO_V4L2 + select VIDEOBUF2_VMALLOC + ---help--- + This is a video4linux2 driver for AirSpy SDR device. + + To compile this driver as a module, choose M here: the + module will be called airspy + diff --git a/drivers/staging/media/airspy/Makefile b/drivers/media/usb/airspy/Makefile index 8d8e61c1a349..8d8e61c1a349 100644 --- a/drivers/staging/media/airspy/Makefile +++ b/drivers/media/usb/airspy/Makefile diff --git a/drivers/staging/media/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c index 255fe6a5b4e7..255fe6a5b4e7 100644 --- a/drivers/staging/media/airspy/airspy.c +++ b/drivers/media/usb/airspy/airspy.c diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 8abda145e597..a326d5d95ca8 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -19,7 +19,6 @@ menuconfig STAGING_MEDIA if STAGING_MEDIA # Please keep them in alphabetic order -source "drivers/staging/media/airspy/Kconfig" source "drivers/staging/media/as102/Kconfig" source "drivers/staging/media/bcm2048/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 74a9d5a57bc2..e1e053a357cc 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -1,4 +1,3 @@ -obj-$(CONFIG_USB_AIRSPY) += airspy/ obj-$(CONFIG_DVB_AS102) += as102/ obj-$(CONFIG_I2C_BCM2048) += bcm2048/ obj-$(CONFIG_DVB_CXD2099) += cxd2099/ diff --git a/drivers/staging/media/airspy/Kconfig b/drivers/staging/media/airspy/Kconfig deleted file mode 100644 index 59a829b19e79..000000000000 --- a/drivers/staging/media/airspy/Kconfig +++ /dev/null @@ -1,5 +0,0 @@ -config USB_AIRSPY - tristate "AirSpy" - depends on USB && VIDEO_DEV && VIDEO_V4L2 && I2C - select VIDEOBUF2_VMALLOC - default m if !MEDIA_SUBDRV_AUTOSELECT |