Merge branch 'linusw/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

Device driver features, cleanups and bug fixes.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --combined drivers/gpio/Kconfig
index 3a67145,d972932..ab97eb8
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -30,6 -30,9 +30,9 @@@ config ARCH_REQUIRE_GPIOLI
          Selecting this from the architecture code will cause the gpiolib
          code to always get built in.
  
+ config GPIO_DEVRES
+       def_bool y
+       depends on HAS_IOMEM
  
  
  menuconfig GPIOLIB
@@@ -298,14 -301,6 +301,14 @@@ config GPIO_GE_FPG
          and write pin state) for GPIO implemented in a number of GE single
          board computers.
  
 +config GPIO_LYNXPOINT
 +      bool "Intel Lynxpoint GPIO support"
 +      depends on ACPI
 +      select IRQ_DOMAIN
 +      help
 +        driver for GPIO functionality on Intel Lynxpoint PCH chipset
 +        Requires ACPI device enumeration code to set up a platform device.
 +
  comment "I2C GPIO expanders:"
  
  config GPIO_ARIZONA

diff --combined drivers/gpio/Makefile
index 519daaf,36ca605..4398034
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -2,7 -2,8 +2,8 @@@
  
  ccflags-$(CONFIG_DEBUG_GPIO)  += -DDEBUG
  
- obj-$(CONFIG_GPIOLIB)         += gpiolib.o devres.o
+ obj-$(CONFIG_GPIO_DEVRES)     += devres.o
+ obj-$(CONFIG_GPIOLIB)         += gpiolib.o
  obj-$(CONFIG_OF_GPIO)         += gpiolib-of.o
  obj-$(CONFIG_GPIO_ACPI)               += gpiolib-acpi.o
  
@@@ -31,7 -32,6 +32,7 @@@ obj-$(CONFIG_GPIO_JANZ_TTL)   += gpio-jan
  obj-$(CONFIG_ARCH_KS8695)     += gpio-ks8695.o
  obj-$(CONFIG_GPIO_LANGWELL)   += gpio-langwell.o
  obj-$(CONFIG_ARCH_LPC32XX)    += gpio-lpc32xx.o
 +obj-$(CONFIG_GPIO_LYNXPOINT)  += gpio-lynxpoint.o
  obj-$(CONFIG_GPIO_MAX730X)    += gpio-max730x.o
  obj-$(CONFIG_GPIO_MAX7300)    += gpio-max7300.o
  obj-$(CONFIG_GPIO_MAX7301)    += gpio-max7301.o