diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-07 01:52:57 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-07 01:52:57 +0530 |
| commit | 97caf63d0c837f9b5c9f6f469979e68c0378e83f (patch) | |
| tree | c6fc834bcfb66268f474324eca619db419010532 /drivers/Makefile | |
| parent | 6a1a6f4f69adf0febfd923795b45edeff63e75ed (diff) | |
Merge branch '3.4-rc1' into android-tegra-nv-3.3-rebased
Change-Id: Ib3b69ffc5ac3e07c9cc44cc49e9142088eec477e
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 5f8c75db02ad..2457d5e9b26d 100644 --- 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/ @@ -127,6 +126,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/ |