Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index fd7176390168786fc7aaac05c5e9755b5cb3f418..2ba29ffef2cbd84ff0a55d66a861ab3eee2159fa 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -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/