Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eba966a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb 

* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
  uwb: build UWB before USB/WUSB
parents ecc96e79 ae5d82cb

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 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)		+= usb/

obj-$(CONFIG_USB_MUSB_HDRC)	+= usb/musb/

obj-$(CONFIG_PCI)		+= usb/
@@ -101,4 +102,3 @@ obj-$(CONFIG_SSB) += ssb/ 
obj-$(CONFIG_VIRTIO)		+= virtio/

obj-$(CONFIG_REGULATOR)		+= regulator/

obj-$(CONFIG_STAGING)		+= staging/
 
obj-$(CONFIG_UWB)		+= uwb/