diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:30:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:30:48 -0400 |
| commit | c55960499f810357a29659b32d6ea594abee9237 (patch) | |
| tree | b65748db925f7ec894e0b2cf8783609c6fbc88be /drivers/uwb/i1480/Makefile | |
| parent | fbaab1dc19751c80a7df62425f1d9ad2688e42f5 (diff) | |
| parent | 10c6c9c94c3eaadd7f9d6bafccc8709eda0da0f5 (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: Orphan the UWB and WUSB subsystems
uwb: Remove the WLP subsystem and drivers
Diffstat (limited to 'drivers/uwb/i1480/Makefile')
| -rw-r--r-- | drivers/uwb/i1480/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/uwb/i1480/Makefile b/drivers/uwb/i1480/Makefile index 212bbc7d4c32..d69da1684cfb 100644 --- a/drivers/uwb/i1480/Makefile +++ b/drivers/uwb/i1480/Makefile | |||
| @@ -1,2 +1 @@ | |||
| 1 | obj-$(CONFIG_UWB_I1480U) += dfu/ i1480-est.o | obj-$(CONFIG_UWB_I1480U) += dfu/ i1480-est.o | |
| 2 | obj-$(CONFIG_UWB_I1480U_WLP) += i1480u-wlp/ | ||