diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2016-09-13 10:31:59 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-13 10:31:59 +0200 |
commit | 2e68023971477707962143c6d6f5c8620af1342f (patch) | |
tree | a788bc5bf3cc1c0ea15bb04cda73a6dad55baa59 /drivers/gpio/Makefile | |
parent | Merge tag 'v4.8-rc2' into devel (diff) | |
parent | regulator: lp873x: Change the MFD config option as per latest naming (diff) | |
download | linux-2e68023971477707962143c6d6f5c8620af1342f.tar.xz linux-2e68023971477707962143c6d6f5c8620af1342f.zip |
Merge tag 'ib-mfd-gpio-regulator-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into devel
Immutable branch between MFD, GPIO and Regulator due for the v4.9 merge window
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 75bb229213c1..b3e039c3ae8d 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -59,6 +59,7 @@ obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o obj-$(CONFIG_GPIO_LPC18XX) += gpio-lpc18xx.o obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o +obj-$(CONFIG_GPIO_LP873X) += gpio-lp873x.o obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o |