Merge tag 'staging-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging into next

Pull staging driver updates from Greg KH:
 "Here is the big staging driver pull request for 3.16-rc1.

  Lots of stuff here, tons of cleanup patches, a few new drivers, and
  some removed as well, but I think we are still adding a few thousand
  more lines than we remove, due to the new drivers being bigger than
  the ones deleted.

  One notible bit of work did stand out, Jes Sorensen has gone on a
  tear, fixing up a wireless driver to be "more sane" than it originally
  was from the vendor, with over 500 patches merged here.  Good stuff,
  and a number of users laptops are better off for it.

  All of this has been in linux-next for a while"

* tag 'staging-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1703 commits)
  staging: skein: fix sparse warning for static declarations
  staging/mt29f_spinand: coding style fixes
  staging: silicom: fix sparse warning for static variable
  staging: lustre: Fix coding style
  staging: android: binder.c: Use more appropriate functions for euid retrieval
  staging: lustre: fix integer as NULL pointer warnings
  Revert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()"
  Staging: rtl8192u: r8192U_wx.c Fixed a misplaced brace
  staging: ion: shrink highmem pages on kswapd
  staging: ion: use compound pages on high order pages for system heap
  staging: ion: remove struct ion_page_pool_item
  staging: ion: simplify ion_page_pool_total()
  staging: ion: tidy up a bit
  staging: rtl8723au: Remove redundant casting in usb_ops_linux.c
  staging: rtl8723au: Remove redundant casting in rtl8723a_hal_init.c
  staging: rtl8723au: Remove redundant casting in rtw_xmit.c
  staging: rtl8723au: Remove redundant casting in rtw_wlan_util.c
  staging: rtl8723au: Remove redundant casting in rtw_sta_mgt.c
  staging: rtl8723au: Remove redundant casting in rtw_recv.c
  staging: rtl8723au: Remove redundant casting in rtw_mlme.c
  ...

1 files changed, 17 insertions, 4 deletions

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 24c28e3f93a3..a80d23628f14 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -96,9 +96,21 @@ config AD7923
           To compile this driver as a module, choose M here: the
           module will be called ad7923.
 
+config AD799X
+        tristate "Analog Devices AD799x ADC driver"
+        depends on I2C
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Say yes here to build support for Analog Devices:
+          ad7991, ad7995, ad7999, ad7992, ad7993, ad7994, ad7997, ad7998
+          i2c analog to digital converters (ADC). Provides direct access
+          via sysfs.
+
 config AT91_ADC
         tristate "Atmel AT91 ADC"
         depends on ARCH_AT91
+        depends on INPUT
         select IIO_BUFFER
         select IIO_TRIGGERED_BUFFER
         select SYSFS
@@ -107,7 +119,7 @@ config AT91_ADC
 
 config EXYNOS_ADC
         tristate "Exynos ADC driver support"
-        depends on OF
+        depends on ARCH_EXYNOS || (OF && COMPILE_TEST)
         help
           Core support for the ADC block found in the Samsung EXYNOS series
           of SoCs for drivers such as the touchscreen and hwmon to use to share
@@ -146,11 +158,12 @@ config MCP320X
           called mcp320x.
 
 config MCP3422
-        tristate "Microchip Technology MCP3422/3/4 driver"
+        tristate "Microchip Technology MCP3422/3/4/6/7/8 driver"
         depends on I2C
         help
-          Say yes here to build support for Microchip Technology's MCP3422,
-          MCP3423 or MCP3424 analog to digital converters.
+          Say yes here to build support for Microchip Technology's
+          MCP3422, MCP3423, MCP3424, MCP3426, MCP3427 or MCP3428
+          analog to digital converters.
 
           This driver can also be built as a module. If so, the module will be
           called mcp3422.