Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 213556
b: refs/heads/master
c: eabf0f5
h: refs/heads/master
v: v3
  • Loading branch information
Michael Prokop authored and Greg Kroah-Hartman committed Oct 22, 2010
1 parent 07d7fb8 commit fb5d865
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d8087427ccefc0b3364735b96274375246fd452c
refs/heads/master: eabf0f5f09b1f1538d22c14aa0a703c11791bd1e
10 changes: 5 additions & 5 deletions trunk/drivers/usb/gadget/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,8 @@ config USB_FUNCTIONFS
depends on EXPERIMENTAL
select USB_FUNCTIONFS_GENERIC if !(USB_FUNCTIONFS_ETH || USB_FUNCTIONFS_RNDIS)
help
The Function Filesystem (FunctioFS) lets one create USB
composite functions in user space in the same way as GadgetFS
The Function Filesystem (FunctionFS) lets one create USB
composite functions in user space in the same way GadgetFS
lets one create USB gadgets in user space. This allows creation
of composite gadgets such that some of the functions are
implemented in kernel space (for instance Ethernet, serial or
Expand All @@ -733,14 +733,14 @@ config USB_FUNCTIONFS_ETH
bool "Include configuration with CDC ECM (Ethernet)"
depends on USB_FUNCTIONFS && NET
help
Include a configuration with CDC ECM funcion (Ethernet) and the
Funcion Filesystem.
Include a configuration with CDC ECM function (Ethernet) and the
Function Filesystem.

config USB_FUNCTIONFS_RNDIS
bool "Include configuration with RNDIS (Ethernet)"
depends on USB_FUNCTIONFS && NET
help
Include a configuration with RNDIS funcion (Ethernet) and the Filesystem.
Include a configuration with RNDIS function (Ethernet) and the Filesystem.

config USB_FUNCTIONFS_GENERIC
bool "Include 'pure' configuration"
Expand Down

0 comments on commit fb5d865

Please sign in to comment.