diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-30 12:38:51 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-30 12:38:51 +0100 |
| commit | d9ba1025a46d368bc00a2981cb2b2a918e9209b7 (patch) | |
| tree | c0451a56f972b01e16c776b572a23b4371ce5c5d /drivers/gpio/Makefile | |
| parent | ad063fbbdda6247c4653b708bf011986e8ab7ec8 (diff) | |
| parent | 64bee4d28c9e2296f4f12a6c4cc40d085c2c9534 (diff) | |
| download | linux-next-d9ba1025a46d368bc00a2981cb2b2a918e9209b7.tar.gz linux-next-d9ba1025a46d368bc00a2981cb2b2a918e9209b7.zip | |
Merge branch 'acpi-enumeration'
* acpi-enumeration:
spi / ACPI: add ACPI enumeration support
gpio / ACPI: add ACPI support
Diffstat (limited to 'drivers/gpio/Makefile')
| -rw-r--r-- | drivers/gpio/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 9aeed6707326..420dbaca05f1 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -4,6 +4,7 @@ ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG obj-$(CONFIG_GPIOLIB) += gpiolib.o devres.o obj-$(CONFIG_OF_GPIO) += gpiolib-of.o +obj-$(CONFIG_GPIO_ACPI) += gpiolib-acpi.o # Device drivers. Generally keep list sorted alphabetically obj-$(CONFIG_GPIO_GENERIC) += gpio-generic.o |