diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 19:35:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 19:35:46 -0400 |
| commit | eba966a4e780199e31e8fd1d21bc9d187b1c9eaf (patch) | |
| tree | 9197d7ac5022217c7d441b425cbbd245e6a19746 /drivers/Makefile | |
| parent | ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6 (diff) | |
| parent | ae5d82cb8d600989338bbda5ea38f5c0ff47175a (diff) | |
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
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 2503f7b99b2..fceb71a741c 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -56,6 +56,7 @@ obj-$(CONFIG_MAC) += macintosh/ | |||
| 56 | obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ | 56 | obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ |
| 57 | obj-$(CONFIG_PARIDE) += block/paride/ | 57 | obj-$(CONFIG_PARIDE) += block/paride/ |
| 58 | obj-$(CONFIG_TC) += tc/ | 58 | obj-$(CONFIG_TC) += tc/ |
| 59 | obj-$(CONFIG_UWB) += uwb/ | ||
| 59 | obj-$(CONFIG_USB) += usb/ | 60 | obj-$(CONFIG_USB) += usb/ |
| 60 | obj-$(CONFIG_USB_MUSB_HDRC) += usb/musb/ | 61 | obj-$(CONFIG_USB_MUSB_HDRC) += usb/musb/ |
| 61 | obj-$(CONFIG_PCI) += usb/ | 62 | obj-$(CONFIG_PCI) += usb/ |
| @@ -101,4 +102,3 @@ obj-$(CONFIG_SSB) += ssb/ | |||
| 101 | obj-$(CONFIG_VIRTIO) += virtio/ | 102 | obj-$(CONFIG_VIRTIO) += virtio/ |
| 102 | obj-$(CONFIG_REGULATOR) += regulator/ | 103 | obj-$(CONFIG_REGULATOR) += regulator/ |
| 103 | obj-$(CONFIG_STAGING) += staging/ | 104 | obj-$(CONFIG_STAGING) += staging/ |
| 104 | obj-$(CONFIG_UWB) += uwb/ | ||