---

yaml --- r: 367068 b: refs/heads/master c: 82cd0b2 h: refs/heads/master v: v3
git-mirror · Apr 17, 2013 · e2b82fe · e2b82fe
1 parent 2b1c2cc
commit e2b82fe
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 2,231 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 098af4bde09792314ff106f545c405ffc5942c25
+refs/heads/master: 82cd0b278fddc1c0bc7e187ff82fd0e273520233
diff --git a/trunk/Documentation/video4linux/si476x.txt b/trunk/Documentation/video4linux/si476x.txt
diff --git a/trunk/drivers/media/radio/Kconfig b/trunk/drivers/media/radio/Kconfig
@@ -18,23 +18,6 @@ config RADIO_SI470X
 
 source "drivers/media/radio/si470x/Kconfig"
 
-config RADIO_SI476X
-	tristate "Silicon Laboratories Si476x I2C FM Radio"
-	depends on I2C && VIDEO_V4L2 && SND && SND_SOC
-	select MFD_CORE
-	select MFD_SI476X_CORE
-	select SND_SOC_SI476X
-	---help---
-	  Choose Y here if you have this FM radio chip.
-
-	  In order to control your radio card, you will need to use programs
-	  that are compatible with the Video For Linux 2 API.  Information on
-	  this API and pointers to "v4l2" programs may be found at
-	  <file:Documentation/video4linux/API.html>.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called radio-si476x.
-
 config USB_MR800
 	tristate "AverMedia MR 800 USB FM radio support"
 	depends on USB && VIDEO_V4L2

diff --git a/trunk/drivers/media/radio/Makefile b/trunk/drivers/media/radio/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o
 obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
 obj-$(CONFIG_I2C_SI4713) += si4713-i2c.o
 obj-$(CONFIG_RADIO_SI4713) += radio-si4713.o
-obj-$(CONFIG_RADIO_SI476X) += radio-si476x.o
 obj-$(CONFIG_RADIO_MIROPCM20) += radio-miropcm20.o
 obj-$(CONFIG_USB_DSBR) += dsbr100.o
 obj-$(CONFIG_RADIO_SI470X) += si470x/