Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Oct 2008 23:35:41 +0000 (16:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Oct 2008 23:35:46 +0000 (16:35 -0700)
* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
  uwb: build UWB before USB/WUSB

1  2 
drivers/Makefile

diff --combined drivers/Makefile
index 2503f7b99b2fdc70edf3648d365c7a2c35e85eaa,43fa673c68a7c02f8da7b1edf4f11c74c6a15bf4..fceb71a741c3ca5a71131a487ea24a8cd63fb243
@@@ -56,6 -56,7 +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/
@@@ -82,7 -83,6 +83,7 @@@ obj-$(CONFIG_EISA)            += eisa
  obj-y                         += lguest/
  obj-$(CONFIG_CPU_FREQ)                += cpufreq/
  obj-$(CONFIG_CPU_IDLE)                += cpuidle/
 +obj-y                         += idle/
  obj-$(CONFIG_MMC)             += mmc/
  obj-$(CONFIG_MEMSTICK)                += memstick/
  obj-$(CONFIG_NEW_LEDS)                += leds/
@@@ -101,4 -101,3 +102,3 @@@ obj-$(CONFIG_SSB)          += ssb
  obj-$(CONFIG_VIRTIO)          += virtio/
  obj-$(CONFIG_REGULATOR)               += regulator/
  obj-$(CONFIG_STAGING)         += staging/
- obj-$(CONFIG_UWB)             += uwb/