Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem
[linux-2.6.git] / drivers / Makefile
index a29527f..7fa433a 100644 (file)
@@ -17,6 +17,9 @@ obj-$(CONFIG_SFI)             += sfi/
 # was used and do nothing if so
 obj-$(CONFIG_PNP)              += pnp/
 obj-$(CONFIG_ARM_AMBA)         += amba/
+# Many drivers will want to use DMA so this has to be made available
+# really early.
+obj-$(CONFIG_DMA_ENGINE)       += dma/
 
 obj-$(CONFIG_VIRTIO)           += virtio/
 obj-$(CONFIG_XEN)              += xen/
@@ -64,11 +67,10 @@ obj-$(CONFIG_ATA_OVER_ETH)  += block/aoe/
 obj-$(CONFIG_PARIDE)           += block/paride/
 obj-$(CONFIG_TC)               += tc/
 obj-$(CONFIG_UWB)              += uwb/
-obj-$(CONFIG_USB_OTG_UTILS)    += usb/otg/
+obj-$(CONFIG_USB_OTG_UTILS)    += usb/
 obj-$(CONFIG_USB)              += usb/
-obj-$(CONFIG_USB_MUSB_HDRC)    += usb/musb/
 obj-$(CONFIG_PCI)              += usb/
-obj-$(CONFIG_USB_GADGET)       += usb/gadget/
+obj-$(CONFIG_USB_GADGET)       += usb/
 obj-$(CONFIG_SERIO)            += input/serio/
 obj-$(CONFIG_GAMEPORT)         += input/gameport/
 obj-$(CONFIG_INPUT)            += input/
@@ -76,6 +78,7 @@ obj-$(CONFIG_I2O)             += message/
 obj-$(CONFIG_RTC_LIB)          += rtc/
 obj-y                          += i2c/ media/
 obj-$(CONFIG_PPS)              += pps/
+obj-$(CONFIG_PTP_1588_CLOCK)   += ptp/
 obj-$(CONFIG_W1)               += w1/
 obj-$(CONFIG_POWER_SUPPLY)     += power/
 obj-$(CONFIG_HWMON)            += hwmon/
@@ -92,10 +95,9 @@ obj-$(CONFIG_EISA)           += eisa/
 obj-y                          += lguest/
 obj-$(CONFIG_CPU_FREQ)         += cpufreq/
 obj-$(CONFIG_CPU_IDLE)         += cpuidle/
-obj-$(CONFIG_DMA_ENGINE)       += dma/
 obj-$(CONFIG_MMC)              += mmc/
 obj-$(CONFIG_MEMSTICK)         += memstick/
-obj-$(CONFIG_NEW_LEDS)         += leds/
+obj-y                          += leds/
 obj-$(CONFIG_INFINIBAND)       += infiniband/
 obj-$(CONFIG_SGI_SN)           += sn/
 obj-y                          += firmware/
@@ -120,3 +122,8 @@ obj-y                               += ieee802154/
 obj-y                          += clk/
 
 obj-$(CONFIG_HWSPINLOCK)       += hwspinlock/
+obj-$(CONFIG_NFC)              += nfc/
+obj-$(CONFIG_IOMMU_SUPPORT)    += iommu/
+
+# Virtualization drivers
+obj-$(CONFIG_VIRT_DRIVERS)     += virt/