summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-26 16:35:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-26 16:35:46 -0700
commiteba966a4e780199e31e8fd1d21bc9d187b1c9eaf (patch)
tree9197d7ac5022217c7d441b425cbbd245e6a19746
parentecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6 (diff)
parentae5d82cb8d600989338bbda5ea38f5c0ff47175a (diff)
downloadop-kernel-dev-eba966a4e780199e31e8fd1d21bc9d187b1c9eaf.zip
op-kernel-dev-eba966a4e780199e31e8fd1d21bc9d187b1c9eaf.tar.gz
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
-rw-r--r--drivers/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 2503f7b9..fceb71a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -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/
OpenPOWER on IntegriCloud