Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289119
b: refs/heads/master
c: b0406db
h: refs/heads/master
i:
  289117: 217aaa5
  289115: a9ac49e
  289111: fcf02ab
  289103: 92433f6
  289087: 0365702
v: v3
  • Loading branch information
Chris Kelly authored and Greg Kroah-Hartman committed Feb 24, 2012
1 parent 79ad738 commit f55b159
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 066b2229410f2f58fa91baedd22b4dcf048e28dd
refs/heads/master: b0406db5b3e45098bafb45c673992bd123a04e6b
2 changes: 2 additions & 0 deletions trunk/drivers/staging/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,6 @@ source "drivers/staging/telephony/Kconfig"

source "drivers/staging/ramster/Kconfig"

source "drivers/staging/ozwpan/Kconfig"

endif # STAGING
1 change: 1 addition & 0 deletions trunk/drivers/staging/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ obj-$(CONFIG_DRM_OMAP) += omapdrm/
obj-$(CONFIG_ANDROID) += android/
obj-$(CONFIG_PHONE) += telephony/
obj-$(CONFIG_RAMSTER) += ramster/
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/
20 changes: 20 additions & 0 deletions trunk/drivers/staging/ozwpan/Kbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -----------------------------------------------------------------------------
# Copyright (c) 2011 Ozmo Inc
# Released under the GNU General Public License Version 2 (GPLv2).
# -----------------------------------------------------------------------------
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan.o
ozwpan-y := \
ozmain.o \
ozpd.o \
ozusbsvc.o \
ozusbsvc1.o \
ozhcd.o \
ozeltbuf.o \
ozproto.o \
ozcdev.o \
ozalloc.o \
ozurbparanoia.o \
oztrace.o \
ozevent.o


9 changes: 9 additions & 0 deletions trunk/drivers/staging/ozwpan/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
config USB_WPAN_HCD
tristate "USB over WiFi Host Controller"
depends on USB
help
A driver for USB Host Controllers that are compatible with
Ozmo Devices USB over WiFi technology.

To compile this driver a module, choose M here: the module
will be called "ozwpan".

0 comments on commit f55b159

Please sign in to comment.