tea575x: Move from sound to media

RFC PATCH In review Ondrej Zary 1 participant 1 message Jun 13, 2013

Subsystems (2)

Media (V4L/DVB) Sound

lore

Share & tools

lore

Ondrej Zary

author

2013-06-13 21:39 UTC #0 lore raw

RFC PATCH 2/2 tea575x: Move from sound to media

Move tea575x from sound/i2c/other to drivers/media/radio

Signed-off-by Ondrej Zary <[email protected]>

---
 drivers/media/radio/Kconfig     |    5 +
 drivers/media/radio/Makefile    |    1 +
 drivers/media/radio/tea575x.c   |  577 +++++++++++++++++++++++++++++++++++++++
 sound/i2c/other/Makefile        |    2 -
 sound/i2c/other/tea575x-tuner.c |  577 ---------------------------------------
 sound/pci/Kconfig               |    5 -
 6 files changed, 583 insertions(+), 584 deletions(-)
 create mode 100644 drivers/media/radio/tea575x.c
 delete mode 100644 sound/i2c/other/tea575x-tuner.c

drivers/media/radio/Kconfig +5 -0

index c0beee2..0f6341d 100644
@@ -12,6 +12,11 @@ menuconfig RADIO_ADAPTERS
 
 if RADIO_ADAPTERS && VIDEO_V4L2
 
+config RADIO_TEA575X
+	tristate
+	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
+	default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
+
 config RADIO_SI470X
 	bool "Silicon Labs Si470x FM Radio Receiver support"
 	depends on VIDEO_V4L2

drivers/media/radio/Makefile +1 -0

index 0dcdb32..3b64560 100644
@@ -32,6 +32,7 @@ obj-$(CONFIG_RADIO_TEF6862) += tef6862.o
 obj-$(CONFIG_RADIO_TIMBERDALE) += radio-timb.o
 obj-$(CONFIG_RADIO_WL1273) += radio-wl1273.o
 obj-$(CONFIG_RADIO_WL128X) += wl128x/
+obj-$(CONFIG_RADIO_TEA575X) += tea575x.o
 
 shark2-objs := radio-shark2.o radio-tea5777.o

drivers/media/radio/tea575x.c new file +577 -0

577 lines not on this page · raw message

sound/i2c/other/Makefile +0 -2

index c95d8f1..5526b03 100644
@@ -8,10 +8,8 @@ snd-ak4117-objs := ak4117.o
 snd-ak4113-objs := ak4113.o
 snd-ak4xxx-adda-objs := ak4xxx-adda.o
 snd-pt2258-objs := pt2258.o
-snd-tea575x-tuner-objs := tea575x-tuner.o
 
 # Module Dependency
 obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o
 obj-$(CONFIG_SND_ICE1712) += snd-ak4xxx-adda.o
 obj-$(CONFIG_SND_ICE1724) += snd-ak4114.o snd-ak4113.o snd-ak4xxx-adda.o snd-pt2258.o
-obj-$(CONFIG_SND_TEA575X) += snd-tea575x-tuner.o

sound/i2c/other/tea575x-tuner.c deleted +0 ~~-577~~

577 lines not on this page · raw message

sound/pci/Kconfig +0 -5

index fe6fa93..3ef9f63 100644
@@ -1,10 +1,5 @@
 # ALSA PCI drivers
 
-config SND_TEA575X
-	tristate
-	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
-	default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
-
 menuconfig SND_PCI
 	bool "PCI sound devices"
 	depends on PCI

Signature · 1 line

Ondrej Zary