diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 19:23:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 19:23:38 -0400 |
commit | 159d8133d0b54a501a41a66fe3a0e7d16405e36d (patch) | |
tree | dd9b0204d90b25e1e0be933348776f09434333c6 /drivers/usb | |
parent | 05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1 (diff) | |
parent | c800bcd5f53fd9455fc6c68f1a34306e5aa4f79a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual rocket science -- mostly documentation and comment updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
sparse: fix comment
doc: fix double words
isdn: capi: fix "CAPI_VERSION" comment
doc: DocBook: Fix typos in xml and template file
Bluetooth: add module name for btwilink
driver core: unexport static function create_syslog_header
mmc: core: typo fix in printk specifier
ARM: spear: clean up editing mistake
net-sysfs: fix comment typo 'CONFIG_SYFS'
doc: Insert MODULE_ in module-signing macros
Documentation: update URL to hfsplus Technote 1150
gpio: update path to documentation
ixgbe: Fix format string in ixgbe_fcoe.
Kconfig: Remove useless "default N" lines
user_namespace.c: Remove duplicated word in comment
CREDITS: fix formatting
treewide: Fix typo in Documentation/DocBook
mm: Fix warning on make htmldocs caused by slab.c
ata: ata-samsung_cf: cleanup in header file
idr: remove unused prototype of idr_free()
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/Kconfig | 1 | ||||
-rw-r--r-- | drivers/usb/core/message.c | 2 | ||||
-rw-r--r-- | drivers/usb/core/urb.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/Kconfig | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index fed7f68d025d..cb8e99156f5a 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig | |||
@@ -10,7 +10,6 @@ config USB_DEBUG | |||
10 | 10 | ||
11 | config USB_ANNOUNCE_NEW_DEVICES | 11 | config USB_ANNOUNCE_NEW_DEVICES |
12 | bool "USB announce new devices" | 12 | bool "USB announce new devices" |
13 | default N | ||
14 | help | 13 | help |
15 | Say Y here if you want the USB core to always announce the | 14 | Say Y here if you want the USB core to always announce the |
16 | idVendor, idProduct, Manufacturer, Product, and SerialNumber | 15 | idVendor, idProduct, Manufacturer, Product, and SerialNumber |
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 3cdcd0a2c0b7..0c8a7fc4dad8 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -178,7 +178,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg); | |||
178 | * | 178 | * |
179 | * Return: | 179 | * Return: |
180 | * If successful, 0. Otherwise a negative error number. The number of actual | 180 | * If successful, 0. Otherwise a negative error number. The number of actual |
181 | * bytes transferred will be stored in the @actual_length paramater. | 181 | * bytes transferred will be stored in the @actual_length parameter. |
182 | */ | 182 | */ |
183 | int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe, | 183 | int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe, |
184 | void *data, int len, int *actual_length, int timeout) | 184 | void *data, int len, int *actual_length, int timeout) |
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c index 9ff665f1322f..991386ceb4ec 100644 --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c | |||
@@ -831,7 +831,7 @@ EXPORT_SYMBOL_GPL(usb_unpoison_anchored_urbs); | |||
831 | * | 831 | * |
832 | * this allows all outstanding URBs to be unlinked starting | 832 | * this allows all outstanding URBs to be unlinked starting |
833 | * from the back of the queue. This function is asynchronous. | 833 | * from the back of the queue. This function is asynchronous. |
834 | * The unlinking is just tiggered. It may happen after this | 834 | * The unlinking is just triggered. It may happen after this |
835 | * function has returned. | 835 | * function has returned. |
836 | * | 836 | * |
837 | * This routine should not be called by a driver after its disconnect | 837 | * This routine should not be called by a driver after its disconnect |
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index e22b82660831..3d9e54062d62 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -314,7 +314,6 @@ config USB_ISP1760_HCD | |||
314 | 314 | ||
315 | config USB_ISP1362_HCD | 315 | config USB_ISP1362_HCD |
316 | tristate "ISP1362 HCD support" | 316 | tristate "ISP1362 HCD support" |
317 | default N | ||
318 | ---help--- | 317 | ---help--- |
319 | Supports the Philips ISP1362 chip as a host controller | 318 | Supports the Philips ISP1362 chip as a host controller |
320 | 319 | ||
@@ -326,7 +325,6 @@ config USB_ISP1362_HCD | |||
326 | config USB_FUSBH200_HCD | 325 | config USB_FUSBH200_HCD |
327 | tristate "FUSBH200 HCD support" | 326 | tristate "FUSBH200 HCD support" |
328 | depends on USB | 327 | depends on USB |
329 | default N | ||
330 | ---help--- | 328 | ---help--- |
331 | Faraday FUSBH200 is designed to meet USB2.0 EHCI specification | 329 | Faraday FUSBH200 is designed to meet USB2.0 EHCI specification |
332 | with minor modification. | 330 | with minor modification. |
@@ -337,7 +335,6 @@ config USB_FUSBH200_HCD | |||
337 | config USB_FOTG210_HCD | 335 | config USB_FOTG210_HCD |
338 | tristate "FOTG210 HCD support" | 336 | tristate "FOTG210 HCD support" |
339 | depends on USB | 337 | depends on USB |
340 | default N | ||
341 | ---help--- | 338 | ---help--- |
342 | Faraday FOTG210 is an OTG controller which can be configured as | 339 | Faraday FOTG210 is an OTG controller which can be configured as |
343 | an USB2.0 host. It is designed to meet USB2.0 EHCI specification | 340 | an USB2.0 host. It is designed to meet USB2.0 EHCI specification |