projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[linux-2.6-block.git]
/
drivers
/
Makefile
diff --git
a/drivers/Makefile
b/drivers/Makefile
index 47a118aec76f1253854d8f5c7cea1cf903f24d8a..b250b36b54f26690840ffdd47d0c96bfc3aec7b6 100644
(file)
--- a/
drivers/Makefile
+++ b/
drivers/Makefile
@@
-11,7
+11,7
@@
obj-y += bus/
obj-$(CONFIG_GENERIC_PHY) += phy/
# GPIO must come after pinctrl as gpios may need to mux pins etc
-obj-
y
+= pinctrl/
+obj-
$(CONFIG_PINCTRL)
+= pinctrl/
obj-y += gpio/
obj-y += pwm/
obj-$(CONFIG_PCI) += pci/