Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils

[linux-beck.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index c07be024b962aa9ad8cce1ef635f37acd0a18fae..262b19d6b627a7541266f0f569f97197be06e906 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -86,7 +86,6 @@ obj-$(CONFIG_POWER_SUPPLY)    += power/
 obj-$(CONFIG_HWMON)            += hwmon/
 obj-$(CONFIG_THERMAL)          += thermal/
 obj-$(CONFIG_WATCHDOG)         += watchdog/
-obj-$(CONFIG_PHONE)            += telephony/
 obj-$(CONFIG_MD)               += md/
 obj-$(CONFIG_BT)               += bluetooth/
 obj-$(CONFIG_ACCESSIBILITY)    += accessibility/
@@ -126,6 +125,8 @@ obj-y                               += clk/
 obj-$(CONFIG_HWSPINLOCK)       += hwspinlock/
 obj-$(CONFIG_NFC)              += nfc/
 obj-$(CONFIG_IOMMU_SUPPORT)    += iommu/
+obj-$(CONFIG_REMOTEPROC)       += remoteproc/
+obj-$(CONFIG_RPMSG)            += rpmsg/
 
 # Virtualization drivers
 obj-$(CONFIG_VIRT_DRIVERS)     += virt/