Merge branch 'fix/misc' into topic/misc

diff --combined drivers/media/radio/Kconfig
index 851716a,299994c..e4c97fd
--- 1/drivers/media/radio/Kconfig
--- 2/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@@ -166,6 -166,21 +166,6 @@@ config RADIO_MAXIRADI
          To compile this driver as a module, choose M here: the
          module will be called radio-maxiradio.
  
 -config RADIO_MAESTRO
 -      tristate "Maestro on board radio"
 -      depends on VIDEO_V4L2 && PCI
 -      ---help---
 -        Say Y here to directly support the on-board radio tuner on the
 -        Maestro 2 or 2E sound card.
 -
 -        In order to control your radio card, you will need to use programs
 -        that are compatible with the Video For Linux API.  Information on
 -        this API and pointers to "v4l" 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-maestro.
 -
  config RADIO_MIROPCM20
        tristate "miroSOUND PCM20 radio"
        depends on ISA && VIDEO_V4L2 && SND
@@@ -426,6 -441,7 +426,7 @@@ config RADIO_TIMBERDAL
  config RADIO_WL1273
        tristate "Texas Instruments WL1273 I2C FM Radio"
        depends on I2C && VIDEO_V4L2
+       select MFD_CORE
        select MFD_WL1273_CORE
        select FW_LOADER
        ---help---
@@@ -439,4 -455,7 +440,7 @@@
          To compile this driver as a module, choose M here: the
          module will be called radio-wl1273.
  
+ # TI's ST based wl128x FM radio
+ source "drivers/media/radio/wl128x/Kconfig"
+ 
  endif # RADIO_ADAPTERS

diff --combined drivers/media/radio/Makefile
index d68907f,2faa333..f484a6e
--- 1/drivers/media/radio/Makefile
--- 2/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
@@@ -16,6 -16,7 +16,6 @@@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gem
  obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
  obj-$(CONFIG_I2C_SI4713) += si4713-i2c.o
  obj-$(CONFIG_RADIO_SI4713) += radio-si4713.o
 -obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
  obj-$(CONFIG_RADIO_MIROPCM20) += radio-miropcm20.o
  obj-$(CONFIG_USB_DSBR) += dsbr100.o
  obj-$(CONFIG_RADIO_SI470X) += si470x/
@@@ -25,5 -26,6 +25,6 @@@ obj-$(CONFIG_RADIO_SAA7706H) += saa7706
  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/
  
  EXTRA_CFLAGS += -Isound