summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBraden Kell <bradenkell@google.com>2017-07-07 16:52:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-07 16:52:39 +0000
commit957c28c0348097e377069756f97eac7609a8d98a (patch)
tree4913c55bd8bbd4a2475778595c681b3f48a5d688
parent073ac4bc54eb60ff711021c43f1178084e5c7bff (diff)
parent40f1e768e2762cc5f017950d46a88e2a547ce8ef (diff)
downloadpi-v4.4-957c28c0348097e377069756f97eac7609a8d98a.tar.gz
Merge "Revert "Revert "pio: Build runtime pin config module in kernel""" into nyc-iot-dev
-rw-r--r--drivers/pinctrl/Makefile1
-rw-r--r--drivers/pinctrl/android-things/Makefile2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 4fd086f78b00..14c9e0af565c 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o
obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o
obj-$(CONFIG_PINCTRL_ZYNQ) += pinctrl-zynq.o
+obj-$(CONFIG_ANDROID) += android-things/
obj-$(CONFIG_ARCH_BCM2708)$(CONFIG_ARCH_BCM2709) += bcm/
obj-$(CONFIG_ARCH_BCM) += bcm/
obj-$(CONFIG_ARCH_BERLIN) += berlin/
diff --git a/drivers/pinctrl/android-things/Makefile b/drivers/pinctrl/android-things/Makefile
new file mode 100644
index 000000000000..d5f2ad12d3c7
--- /dev/null
+++ b/drivers/pinctrl/android-things/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_PINCTRL_BCM2835) += main.o devicetree.o devices.o \
+ platform_devices.o sysfs.o