diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2013-02-05 08:33:49 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-02-05 08:37:46 -0500 |
| commit | 0fa2fd9a0d4f1305a54a396d44975894e90eed7b (patch) | |
| tree | 56045663b63cb29c2515e0c87519ff10398c4ab0 /drivers/gpio/Makefile | |
| parent | 46ebfbc3745597067494186a0e7031add22f3134 (diff) | |
| parent | 476171ce7850b28280db6a2d0c0e4d3ff26c8117 (diff) | |
Merge branch 'linusw/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git into gpio/next
Device driver features, cleanups and bug fixes.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/gpio/Makefile')
| -rw-r--r-- | drivers/gpio/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 519daaf57daf..4398034db4aa 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG | 3 | ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_GPIOLIB) += gpiolib.o devres.o | 5 | obj-$(CONFIG_GPIO_DEVRES) += devres.o |
| 6 | obj-$(CONFIG_GPIOLIB) += gpiolib.o | ||
| 6 | obj-$(CONFIG_OF_GPIO) += gpiolib-of.o | 7 | obj-$(CONFIG_OF_GPIO) += gpiolib-of.o |
| 7 | obj-$(CONFIG_GPIO_ACPI) += gpiolib-acpi.o | 8 | obj-$(CONFIG_GPIO_ACPI) += gpiolib-acpi.o |
| 8 | 9 | ||