Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[safe/jmp/linux-2.6] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index f443a8a..e121b66 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -56,6 +56,8 @@ obj-$(CONFIG_MAC)             += macintosh/
 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)              += usb/
 obj-$(CONFIG_USB_MUSB_HDRC)    += usb/musb/
 obj-$(CONFIG_PCI)              += usb/
@@ -100,3 +102,4 @@ obj-$(CONFIG_OF)            += of/
 obj-$(CONFIG_SSB)              += ssb/
 obj-$(CONFIG_VIRTIO)           += virtio/
 obj-$(CONFIG_REGULATOR)                += regulator/
+obj-$(CONFIG_STAGING)          += staging/