diff options
| author | Braden Kell <bradenkell@google.com> | 2017-05-24 21:19:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-24 21:19:29 +0000 |
| commit | 0a86cd6cec47d13e863a6d1f460182b85436fc6d (patch) | |
| tree | 936684c5d0273b73db494fb962898f33b4f6711b | |
| parent | bf05b0b5cec5a6366283351051b9a9c4a282728c (diff) | |
| parent | e9f50c44f60eed71ec3926446c218d1a98d857b1 (diff) | |
| download | pi-v4.4-0a86cd6cec47d13e863a6d1f460182b85436fc6d.tar.gz | |
Merge "pio: Build runtime pin config module in kernel" into nyc-iot-dev
am: e9f50c44f6
Change-Id: Ia8e59110883cefb2d481be63e2d595ced72cb4a6
| -rw-r--r-- | drivers/pinctrl/Makefile | 1 | ||||
| -rw-r--r-- | drivers/pinctrl/android-things/Makefile | 2 |
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 |