projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e43d2b7 8bfcbbb)
Merge branch 'bcm-nsp' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 10 Dec 2015 17:47:28 +0000 (18:47 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 10 Dec 2015 17:47:28 +0000 (18:47 +0100)
1  2 
drivers/pinctrl/bcm/Kconfig patch | diff1 | diff2 | blob | history
drivers/pinctrl/bcm/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/pinctrl/bcm/Kconfig
Simple merge
diff --cc drivers/pinctrl/bcm/Makefile
index 9ac6370f1c92122d5a47c7b5eb8a7a6858075220,2fb1ed85b7376ea068f87c9d2a17bb267dd186b3..6148367d5e8cdd1762429a16bac7de24bd6bd51d
--- 1/drivers/pinctrl/bcm/Makefile
--- 2/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