diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 00:38:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 00:38:27 -0400 |
| commit | 49dc2b7173010792c6923930ffcee84b7094b7de (patch) | |
| tree | 439899abc82e7413b3bee6d52823d5350d7f2245 /drivers/usb/gadget/legacy/Kconfig | |
| parent | d66435cc7da95964cb386674bd82ec12ca66320a (diff) | |
| parent | d00cd819d7dfb1a24d814457f47ff4d6c7be152c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
drivers/rtc: broken link fix
drm/i915 Fix typos in i915_gem_fence.c
Docs: fix missing word in REPORTING-BUGS
lib+mm: fix few spelling mistakes
MAINTAINERS: add git URL for APM driver
treewide: Fix typo in printk
Diffstat (limited to 'drivers/usb/gadget/legacy/Kconfig')
| -rw-r--r-- | drivers/usb/gadget/legacy/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/legacy/Kconfig b/drivers/usb/gadget/legacy/Kconfig index a23d1b90454c..0b36878eb5fd 100644 --- a/drivers/usb/gadget/legacy/Kconfig +++ b/drivers/usb/gadget/legacy/Kconfig | |||
| @@ -103,8 +103,7 @@ config USB_ETH | |||
| 103 | - CDC Ethernet Emulation Model (EEM) is a newer standard that has | 103 | - CDC Ethernet Emulation Model (EEM) is a newer standard that has |
| 104 | a simpler interface that can be used by more USB hardware. | 104 | a simpler interface that can be used by more USB hardware. |
| 105 | 105 | ||
| 106 | RNDIS support is an additional option, more demanding than than | 106 | RNDIS support is an additional option, more demanding than subset. |
| 107 | subset. | ||
| 108 | 107 | ||
| 109 | Within the USB device, this gadget driver exposes a network device | 108 | Within the USB device, this gadget driver exposes a network device |
| 110 | "usbX", where X depends on what other networking devices you have. | 109 | "usbX", where X depends on what other networking devices you have. |