Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 092a62e79688da9b1a7466da63e52b9788f86ea0..65ac273d67be7acc0f9a13cf43c97286e3ac4ebe 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -111,6 +111,7 @@ obj-$(CONFIG_CPU_IDLE)              += cpuidle/
 obj-y                          += mmc/
 obj-$(CONFIG_MEMSTICK)         += memstick/
 obj-y                          += leds/
+obj-$(CONFIG_SWITCH)           += switch/
 obj-$(CONFIG_INFINIBAND)       += infiniband/
 obj-$(CONFIG_SGI_SN)           += sn/
 obj-y                          += firmware/
@@ -154,3 +155,4 @@ obj-$(CONFIG_IPACK_BUS)             += ipack/
 obj-$(CONFIG_NTB)              += ntb/
 
 obj-$(CONFIG_GATOR)            += gator/
+obj-$(CONFIG_CORESIGHT)                += coresight/