crypto: caam - fix possible deadlock condition

[~andy/linux] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 95952c82bf16653e40aa46ef1eeaa2f4fe96f8fa..2ba29ffef2cbd84ff0a55d66a861ab3eee2159fa 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_SFI)             += sfi/
 # PnP must come after ACPI since it will eventually need to check if acpi
 # was used and do nothing if so
 obj-$(CONFIG_PNP)              += pnp/
-obj-$(CONFIG_ARM_AMBA)         += amba/
+obj-y                          += amba/
 # Many drivers will want to use DMA so this has to be made available
 # really early.
 obj-$(CONFIG_DMA_ENGINE)       += dma/
@@ -92,7 +92,6 @@ obj-$(CONFIG_BT)              += bluetooth/
 obj-$(CONFIG_ACCESSIBILITY)    += accessibility/
 obj-$(CONFIG_ISDN)             += isdn/
 obj-$(CONFIG_EDAC)             += edac/
-obj-$(CONFIG_MCA)              += mca/
 obj-$(CONFIG_EISA)             += eisa/
 obj-y                          += lguest/
 obj-$(CONFIG_CPU_FREQ)         += cpufreq/
@@ -134,3 +133,7 @@ obj-$(CONFIG_VIRT_DRIVERS)  += virt/
 obj-$(CONFIG_HYPERV)           += hv/
 
 obj-$(CONFIG_PM_DEVFREQ)       += devfreq/
+obj-$(CONFIG_EXTCON)           += extcon/
+obj-$(CONFIG_MEMORY)           += memory/
+obj-$(CONFIG_IIO)              += iio/
+obj-$(CONFIG_VME_BUS)          += vme/