diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-17 06:07:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-17 06:08:00 -0300 |
| commit | 33a31edd4a4b7d26b962b32decfd8ea2377eaa0d (patch) | |
| tree | f8783bac508f9ca63f2e32d631ea4acd23fd5889 /drivers/mfd | |
| parent | 82cd0b278fddc1c0bc7e187ff82fd0e273520233 (diff) | |
Revert "[media] mfd: Add header files and Kbuild plumbing for SI476x MFD core"
As requested by Samuel Ortiz <sameo@linux.intel.com>, revert
this patch.
This reverts commit 3f8ec5df11aa2ad7402cfb3368532a96b63426a4.
Conflicts:
drivers/mfd/Kconfig
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/mfd/Makefile | 4 |
2 files changed, 0 insertions, 17 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index b6bb6d5f89e7..c346941a2515 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -977,19 +977,6 @@ config MFD_WL1273_CORE driver connects the radio-wl1273 V4L2 module and the wl1273 audio codec. -config MFD_SI476X_CORE - tristate "Support for Silicon Laboratories 4761/64/68 AM/FM radio." - depends on I2C - select MFD_CORE - select REGMAP_I2C - help - This is the core driver for the SI476x series of AM/FM - radio. This MFD driver connects the radio-si476x V4L2 module - and the si476x audio codec. - - To compile this driver as a module, choose M here: the - module will be called si476x-core. - config MFD_OMAP_USB_HOST bool "Support OMAP USBHS core and TLL driver" depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3 diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index b7aaa1e104a1..b90409c23664 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -131,10 +131,6 @@ obj-$(CONFIG_MFD_JZ4740_ADC) += jz4740-adc.o obj-$(CONFIG_MFD_TPS6586X) += tps6586x.o obj-$(CONFIG_MFD_VX855) += vx855.o obj-$(CONFIG_MFD_WL1273_CORE) += wl1273-core.o - -si476x-core-y := si476x-cmd.o si476x-prop.o si476x-i2c.o -obj-$(CONFIG_MFD_SI476X_CORE) += si476x-core.o - obj-$(CONFIG_MFD_CS5535) += cs5535-mfd.o obj-$(CONFIG_MFD_OMAP_USB_HOST) += omap-usb-host.o omap-usb-tll.o obj-$(CONFIG_MFD_PM8921_CORE) += pm8921-core.o |