Merge branch 'acpi-enumeration'

* acpi-enumeration:
  spi / ACPI: add ACPI enumeration support
  gpio / ACPI: add ACPI support

diff --combined drivers/gpio/Kconfig
index 47150f5ded04ea4df13c14434fc3fa553141abaf,5c9b384119b83458850234c2e94c1061fc53a36c..f16557690cfd91a65d3788e6ad8168e8e15942bc
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -49,6 -49,10 +49,10 @@@ config OF_GPI
        def_bool y
        depends on OF
  
+ config GPIO_ACPI
+       def_bool y
+       depends on ACPI
+ 
  config DEBUG_GPIO
        bool "Debug GPIO calls"
        depends on DEBUG_KERNEL
@@@ -466,7 -470,7 +470,7 @@@ config GPIO_ADP5588_IR
  
  config GPIO_ADNP
        tristate "Avionic Design N-bit GPIO expander"
 -      depends on I2C && OF
 +      depends on I2C && OF_GPIO
        help
          This option enables support for N GPIOs found on Avionic Design
          I2C GPIO expanders. The register space will be extended by powers