diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-30 06:38:51 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-30 06:38:51 -0500 |
| commit | d9ba1025a46d368bc00a2981cb2b2a918e9209b7 (patch) | |
| tree | c0451a56f972b01e16c776b572a23b4371ce5c5d /drivers/gpio/Kconfig | |
| parent | ad063fbbdda6247c4653b708bf011986e8ab7ec8 (diff) | |
| parent | 64bee4d28c9e2296f4f12a6c4cc40d085c2c9534 (diff) | |
Merge branch 'acpi-enumeration'
* acpi-enumeration:
spi / ACPI: add ACPI enumeration support
gpio / ACPI: add ACPI support
Diffstat (limited to 'drivers/gpio/Kconfig')
| -rw-r--r-- | drivers/gpio/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 47150f5ded04..f16557690cfd 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
| @@ -49,6 +49,10 @@ config OF_GPIO | |||
| 49 | def_bool y | 49 | def_bool y |
| 50 | depends on OF | 50 | depends on OF |
| 51 | 51 | ||
| 52 | config GPIO_ACPI | ||
| 53 | def_bool y | ||
| 54 | depends on ACPI | ||
| 55 | |||
| 52 | config DEBUG_GPIO | 56 | config DEBUG_GPIO |
| 53 | bool "Debug GPIO calls" | 57 | bool "Debug GPIO calls" |
| 54 | depends on DEBUG_KERNEL | 58 | depends on DEBUG_KERNEL |