From: Linus Walleij Date: Thu, 10 Dec 2015 17:47:28 +0000 (+0100) Subject: Merge branch 'bcm-nsp' into devel X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fcb59bdf64e7d6d2bca41624e893b71d319b479b;p=linux.git Merge branch 'bcm-nsp' into devel --- fcb59bdf64e7d6d2bca41624e893b71d319b479b diff --cc drivers/pinctrl/bcm/Makefile index 9ac6370f1c921,2fb1ed85b7376..6148367d5e8cd --- a/drivers/pinctrl/bcm/Makefile +++ b/drivers/pinctrl/bcm/Makefile @@@ -2,5 -2,6 +2,6 @@@ obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o obj-$(CONFIG_PINCTRL_BCM2835) += pinctrl-bcm2835.o -obj-$(CONFIG_PINCTRL_CYGNUS_GPIO) += pinctrl-cygnus-gpio.o +obj-$(CONFIG_PINCTRL_IPROC_GPIO) += pinctrl-iproc-gpio.o obj-$(CONFIG_PINCTRL_CYGNUS_MUX) += pinctrl-cygnus-mux.o + obj-$(CONFIG_PINCTRL_NSP_GPIO) += pinctrl-nsp-gpio.o