aboutsummaryrefslogtreecommitdiff
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2013-10-15 10:35:02 +0800
committerAlex Shi <alex.shi@linaro.org>2013-10-15 10:35:02 +0800
commitb660011c5c1066762b8d29e238a3a478b6f02bf4 (patch)
treea04058e9f6fcbdce048bbb662de8fb74972dfa92 /drivers/Makefile
parentf85b6e7b8e12028219057306eaf24c8d77a5c0c3 (diff)
parent01239d6842a2e2653b7b42736cf2c10b69d0face (diff)
Merge remote-tracking branch 'arm-landing/lsk-3.10-gator' into linux-linaro-lsk-android-testlsk-android-13.10
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 2bb844b79a6..1c92047b81b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -153,3 +153,5 @@ obj-$(CONFIG_IIO) += iio/
obj-$(CONFIG_VME_BUS) += vme/
obj-$(CONFIG_IPACK_BUS) += ipack/
obj-$(CONFIG_NTB) += ntb/
+
+obj-$(CONFIG_GATOR) += gator/