Merge branch 'mcp23s08' of /home/linus/linux-pinctrl into devel

diff --cc drivers/gpio/Kconfig
index dbde3ae03e745a3937d3c8664fc8e68309e92f75,5f88d7324e02fbdf3028dcc4f1037788d8bd93e8..75e64607b209d3132e0e56acea2cd1603a4c3223
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -1225,30 -1225,8 +1225,13 @@@ config GPIO_PISOS
          GPIO driver for SPI compatible parallel-in/serial-out shift
          registers. These are input only devices.
  
 +config GPIO_XRA1403
 +      tristate "EXAR XRA1403 16-bit GPIO expander"
 +      help
 +        GPIO driver for EXAR XRA1403 16-bit SPI-based GPIO expander.
 +
  endmenu
  
- menu "SPI or I2C GPIO expanders"
-       depends on (SPI_MASTER && !I2C) || I2C
- 
- config GPIO_MCP23S08
-       tristate "Microchip MCP23xxx I/O expander"
-       depends on OF_GPIO
-       select GPIOLIB_IRQCHIP
-       select REGMAP_I2C if I2C
-       select REGMAP if SPI_MASTER
-       help
-         SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
-         I/O expanders.
-         This provides a GPIO interface supporting inputs and outputs.
-         The I2C versions of the chips can be used as interrupt-controller.
- 
- endmenu
- 
  menu "USB GPIO expanders"
        depends on USB
  

diff --cc drivers/gpio/Makefile
Simple merge