aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 19:23:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 19:23:38 -0400
commit159d8133d0b54a501a41a66fe3a0e7d16405e36d (patch)
treedd9b0204d90b25e1e0be933348776f09434333c6 /drivers
parent05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1 (diff)
parentc800bcd5f53fd9455fc6c68f1a34306e5aa4f79a (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')
-rw-r--r--drivers/ata/libata-core.c4
-rw-r--r--drivers/base/bus.c2
-rw-r--r--drivers/bluetooth/Kconfig3
-rw-r--r--drivers/gpu/drm/drm_crtc_helper.c2
-rw-r--r--drivers/input/sparse-keymap.c2
-rw-r--r--drivers/misc/mic/Kconfig2
-rw-r--r--drivers/mmc/core/host.c2
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c2
-rw-r--r--drivers/regulator/core.c2
-rw-r--r--drivers/scsi/scsi_transport_iscsi.c6
-rw-r--r--drivers/staging/android/Kconfig2
-rw-r--r--drivers/staging/bcm/Kconfig1
-rw-r--r--drivers/staging/frontier/Kconfig1
-rw-r--r--drivers/staging/media/go7007/Kconfig3
-rw-r--r--drivers/staging/rtl8187se/Kconfig1
-rw-r--r--drivers/staging/rtl8188eu/Kconfig1
-rw-r--r--drivers/staging/rtl8192e/rtl8192e/Kconfig1
-rw-r--r--drivers/staging/rtl8192u/Kconfig1
-rw-r--r--drivers/staging/rtl8712/Kconfig2
-rw-r--r--drivers/staging/usbip/Kconfig4
-rw-r--r--drivers/usb/core/Kconfig1
-rw-r--r--drivers/usb/core/message.c2
-rw-r--r--drivers/usb/core/urb.c2
-rw-r--r--drivers/usb/host/Kconfig3
24 files changed, 15 insertions, 37 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 34406f7fdd7a..c19734d96d7e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1524,7 +1524,7 @@ static void ata_qc_complete_internal(struct ata_queued_cmd *qc)
1524 * @dev: Device to which the command is sent 1524 * @dev: Device to which the command is sent
1525 * @tf: Taskfile registers for the command and the result 1525 * @tf: Taskfile registers for the command and the result
1526 * @cdb: CDB for packet command 1526 * @cdb: CDB for packet command
1527 * @dma_dir: Data tranfer direction of the command 1527 * @dma_dir: Data transfer direction of the command
1528 * @sgl: sg list for the data buffer of the command 1528 * @sgl: sg list for the data buffer of the command
1529 * @n_elem: Number of sg entries 1529 * @n_elem: Number of sg entries
1530 * @timeout: Timeout in msecs (0 for default) 1530 * @timeout: Timeout in msecs (0 for default)
@@ -1712,7 +1712,7 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
1712 * @dev: Device to which the command is sent 1712 * @dev: Device to which the command is sent
1713 * @tf: Taskfile registers for the command and the result 1713 * @tf: Taskfile registers for the command and the result
1714 * @cdb: CDB for packet command 1714 * @cdb: CDB for packet command
1715 * @dma_dir: Data tranfer direction of the command 1715 * @dma_dir: Data transfer direction of the command
1716 * @buf: Data buffer of the command 1716 * @buf: Data buffer of the command
1717 * @buflen: Length of data buffer 1717 * @buflen: Length of data buffer
1718 * @timeout: Timeout in msecs (0 for default) 1718 * @timeout: Timeout in msecs (0 for default)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 59dc8086e4fa..83e910a57563 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -1218,7 +1218,7 @@ err_dev:
1218 * with the name of the subsystem. The root device can carry subsystem- 1218 * with the name of the subsystem. The root device can carry subsystem-
1219 * wide attributes. All registered devices are below this single root 1219 * wide attributes. All registered devices are below this single root
1220 * device and are named after the subsystem with a simple enumeration 1220 * device and are named after the subsystem with a simple enumeration
1221 * number appended. The registered devices are not explicitely named; 1221 * number appended. The registered devices are not explicitly named;
1222 * only 'id' in the device needs to be set. 1222 * only 'id' in the device needs to be set.
1223 * 1223 *
1224 * Do not use this interface for anything new, it exists for compatibility 1224 * Do not use this interface for anything new, it exists for compatibility
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 11a6104a1e4f..f5ce64e03fd7 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -241,5 +241,6 @@ config BT_WILINK
241 core driver to communicate with the BT core of the combo chip. 241 core driver to communicate with the BT core of the combo chip.
242 242
243 Say Y here to compile support for Texas Instrument's WiLink7 driver 243 Say Y here to compile support for Texas Instrument's WiLink7 driver
244 into the kernel or say M to compile it as module. 244 into the kernel or say M to compile it as module (btwilink).
245
245endmenu 246endmenu
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index ea92b827e787..f7a81209beb3 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -564,7 +564,7 @@ drm_crtc_helper_disable(struct drm_crtc *crtc)
564 * Caller must hold mode config lock. 564 * Caller must hold mode config lock.
565 * 565 *
566 * Setup a new configuration, provided by the upper layers (either an ioctl call 566 * Setup a new configuration, provided by the upper layers (either an ioctl call
567 * from userspace or internally e.g. from the fbdev suppport code) in @set, and 567 * from userspace or internally e.g. from the fbdev support code) in @set, and
568 * enable it. This is the main helper functions for drivers that implement 568 * enable it. This is the main helper functions for drivers that implement
569 * kernel mode setting with the crtc helper functions and the assorted 569 * kernel mode setting with the crtc helper functions and the assorted
570 * ->prepare(), ->modeset() and ->commit() helper callbacks. 570 * ->prepare(), ->modeset() and ->commit() helper callbacks.
diff --git a/drivers/input/sparse-keymap.c b/drivers/input/sparse-keymap.c
index a70aa555bbff..e7409c45bdd0 100644
--- a/drivers/input/sparse-keymap.c
+++ b/drivers/input/sparse-keymap.c
@@ -236,7 +236,7 @@ EXPORT_SYMBOL(sparse_keymap_setup);
236 * in an input device that was set up by sparse_keymap_setup(). 236 * in an input device that was set up by sparse_keymap_setup().
237 * NOTE: It is safe to cal this function while input device is 237 * NOTE: It is safe to cal this function while input device is
238 * still registered (however the drivers should care not to try to 238 * still registered (however the drivers should care not to try to
239 * use freed keymap and thus have to shut off interrups/polling 239 * use freed keymap and thus have to shut off interrupts/polling
240 * before freeing the keymap). 240 * before freeing the keymap).
241 */ 241 */
242void sparse_keymap_free(struct input_dev *dev) 242void sparse_keymap_free(struct input_dev *dev)
diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig
index e42b331edbc6..462a5b1d8651 100644
--- a/drivers/misc/mic/Kconfig
+++ b/drivers/misc/mic/Kconfig
@@ -4,7 +4,6 @@ config INTEL_MIC_HOST
4 tristate "Intel MIC Host Driver" 4 tristate "Intel MIC Host Driver"
5 depends on 64BIT && PCI && X86 5 depends on 64BIT && PCI && X86
6 select VHOST_RING 6 select VHOST_RING
7 default N
8 help 7 help
9 This enables Host Driver support for the Intel Many Integrated 8 This enables Host Driver support for the Intel Many Integrated
10 Core (MIC) family of PCIe form factor coprocessor devices that 9 Core (MIC) family of PCIe form factor coprocessor devices that
@@ -25,7 +24,6 @@ config INTEL_MIC_CARD
25 tristate "Intel MIC Card Driver" 24 tristate "Intel MIC Card Driver"
26 depends on 64BIT && X86 25 depends on 64BIT && X86
27 select VIRTIO 26 select VIRTIO
28 default N
29 help 27 help
30 This enables card driver support for the Intel Many Integrated 28 This enables card driver support for the Intel Many Integrated
31 Core (MIC) device family. The card driver communicates shutdown/ 29 Core (MIC) device family. The card driver communicates shutdown/
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 49bc403e31f0..114f6bdfbef3 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -337,7 +337,7 @@ int mmc_of_parse(struct mmc_host *host)
337 break; 337 break;
338 default: 338 default:
339 dev_err(host->parent, 339 dev_err(host->parent,
340 "Invalid \"bus-width\" value %ud!\n", bus_width); 340 "Invalid \"bus-width\" value %u!\n", bus_width);
341 return -EINVAL; 341 return -EINVAL;
342 } 342 }
343 343
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index f58db453a97e..08726177a3eb 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
@@ -585,7 +585,7 @@ static int ixgbe_fcoe_dma_pool_alloc(struct ixgbe_fcoe *fcoe,
585 struct dma_pool *pool; 585 struct dma_pool *pool;
586 char pool_name[32]; 586 char pool_name[32];
587 587
588 snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%d", cpu); 588 snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%u", cpu);
589 589
590 pool = dma_pool_create(pool_name, dev, IXGBE_FCPTR_MAX, 590 pool = dma_pool_create(pool_name, dev, IXGBE_FCPTR_MAX,
591 IXGBE_FCPTR_ALIGN, PAGE_SIZE); 591 IXGBE_FCPTR_ALIGN, PAGE_SIZE);
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index bac485acc7f3..9a09f3cdbabb 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2138,7 +2138,7 @@ EXPORT_SYMBOL_GPL(regulator_is_enabled);
2138 * @regulator: regulator source 2138 * @regulator: regulator source
2139 * 2139 *
2140 * Returns positive if the regulator driver backing the source/client 2140 * Returns positive if the regulator driver backing the source/client
2141 * can change its voltage, false otherwise. Usefull for detecting fixed 2141 * can change its voltage, false otherwise. Useful for detecting fixed
2142 * or dummy regulators and disabling voltage change logic in the client 2142 * or dummy regulators and disabling voltage change logic in the client
2143 * driver. 2143 * driver.
2144 */ 2144 */
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index fd8ffe6bcfdd..0102a2d70dd8 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1225,7 +1225,7 @@ struct bus_type iscsi_flashnode_bus = {
1225 * Adds a sysfs entry for the flashnode session attributes 1225 * Adds a sysfs entry for the flashnode session attributes
1226 * 1226 *
1227 * Returns: 1227 * Returns:
1228 * pointer to allocated flashnode sess on sucess 1228 * pointer to allocated flashnode sess on success
1229 * %NULL on failure 1229 * %NULL on failure
1230 */ 1230 */
1231struct iscsi_bus_flash_session * 1231struct iscsi_bus_flash_session *
@@ -1423,7 +1423,7 @@ static int iscsi_iter_destroy_flashnode_conn_fn(struct device *dev, void *data)
1423} 1423}
1424 1424
1425/** 1425/**
1426 * iscsi_destroy_flashnode_sess - destory flashnode session entry 1426 * iscsi_destroy_flashnode_sess - destroy flashnode session entry
1427 * @fnode_sess: pointer to flashnode session entry to be destroyed 1427 * @fnode_sess: pointer to flashnode session entry to be destroyed
1428 * 1428 *
1429 * Deletes the flashnode session entry and all children flashnode connection 1429 * Deletes the flashnode session entry and all children flashnode connection
@@ -1453,7 +1453,7 @@ static int iscsi_iter_destroy_flashnode_fn(struct device *dev, void *data)
1453} 1453}
1454 1454
1455/** 1455/**
1456 * iscsi_destroy_all_flashnode - destory all flashnode session entries 1456 * iscsi_destroy_all_flashnode - destroy all flashnode session entries
1457 * @shost: pointer to host data 1457 * @shost: pointer to host data
1458 * 1458 *
1459 * Destroys all the flashnode session entries and all corresponding children 1459 * Destroys all the flashnode session entries and all corresponding children
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index ab28d2b5e308..99e484f845f2 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -2,7 +2,6 @@ menu "Android"
2 2
3config ANDROID 3config ANDROID
4 bool "Android Drivers" 4 bool "Android Drivers"
5 default N
6 ---help--- 5 ---help---
7 Enable support for various drivers needed on the Android platform 6 Enable support for various drivers needed on the Android platform
8 7
@@ -73,7 +72,6 @@ config ANDROID_TIMED_GPIO
73 72
74config ANDROID_LOW_MEMORY_KILLER 73config ANDROID_LOW_MEMORY_KILLER
75 bool "Android Low Memory Killer" 74 bool "Android Low Memory Killer"
76 default N
77 ---help--- 75 ---help---
78 Registers processes to be killed when memory is low 76 Registers processes to be killed when memory is low
79 77
diff --git a/drivers/staging/bcm/Kconfig b/drivers/staging/bcm/Kconfig
index 83c9752504d4..8acf4b24a7c9 100644
--- a/drivers/staging/bcm/Kconfig
+++ b/drivers/staging/bcm/Kconfig
@@ -1,7 +1,6 @@
1config BCM_WIMAX 1config BCM_WIMAX
2 tristate "Beceem BCS200/BCS220-3 and BCSM250 wimax support" 2 tristate "Beceem BCS200/BCS220-3 and BCSM250 wimax support"
3 depends on USB && NET 3 depends on USB && NET
4 default N
5 help 4 help
6 This is an experimental driver for the Beceem WIMAX chipset used 5 This is an experimental driver for the Beceem WIMAX chipset used
7 by Sprint 4G. 6 by Sprint 4G.
diff --git a/drivers/staging/frontier/Kconfig b/drivers/staging/frontier/Kconfig
index 7121853bd397..4da290b2f5bd 100644
--- a/drivers/staging/frontier/Kconfig
+++ b/drivers/staging/frontier/Kconfig
@@ -1,6 +1,5 @@
1config TRANZPORT 1config TRANZPORT
2 tristate "Frontier Tranzport and Alphatrack support" 2 tristate "Frontier Tranzport and Alphatrack support"
3 depends on USB 3 depends on USB
4 default N
5 ---help--- 4 ---help---
6 Enable support for the Frontier Tranzport and Alphatrack devices. 5 Enable support for the Frontier Tranzport and Alphatrack devices.
diff --git a/drivers/staging/media/go7007/Kconfig b/drivers/staging/media/go7007/Kconfig
index 04bd0fba7b1f..95a3af644a92 100644
--- a/drivers/staging/media/go7007/Kconfig
+++ b/drivers/staging/media/go7007/Kconfig
@@ -13,7 +13,6 @@ config VIDEO_GO7007
13 select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT 13 select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT
14 select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT 14 select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT
15 select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT 15 select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT
16 default N
17 ---help--- 16 ---help---
18 This is a video4linux driver for the WIS GO7007 MPEG 17 This is a video4linux driver for the WIS GO7007 MPEG
19 encoder chip. 18 encoder chip.
@@ -24,7 +23,6 @@ config VIDEO_GO7007
24config VIDEO_GO7007_USB 23config VIDEO_GO7007_USB
25 tristate "WIS GO7007 USB support" 24 tristate "WIS GO7007 USB support"
26 depends on VIDEO_GO7007 && USB 25 depends on VIDEO_GO7007 && USB
27 default N
28 ---help--- 26 ---help---
29 This is a video4linux driver for the WIS GO7007 MPEG 27 This is a video4linux driver for the WIS GO7007 MPEG
30 encoder chip over USB. 28 encoder chip over USB.
@@ -46,7 +44,6 @@ config VIDEO_GO7007_LOADER
46config VIDEO_GO7007_USB_S2250_BOARD 44config VIDEO_GO7007_USB_S2250_BOARD
47 tristate "Sensoray 2250/2251 support" 45 tristate "Sensoray 2250/2251 support"
48 depends on VIDEO_GO7007_USB && USB 46 depends on VIDEO_GO7007_USB && USB
49 default N
50 ---help--- 47 ---help---
51 This is a video4linux driver for the Sensoray 2250/2251 device. 48 This is a video4linux driver for the Sensoray 2250/2251 device.
52 49
diff --git a/drivers/staging/rtl8187se/Kconfig b/drivers/staging/rtl8187se/Kconfig
index 3162aabbeb07..ff8d41ebca36 100644
--- a/drivers/staging/rtl8187se/Kconfig
+++ b/drivers/staging/rtl8187se/Kconfig
@@ -6,6 +6,5 @@ config R8187SE
6 select WEXT_PRIV 6 select WEXT_PRIV
7 select EEPROM_93CX6 7 select EEPROM_93CX6
8 select CRYPTO 8 select CRYPTO
9 default N
10 ---help--- 9 ---help---
11 If built as a module, it will be called r8187se.ko. 10 If built as a module, it will be called r8187se.ko.
diff --git a/drivers/staging/rtl8188eu/Kconfig b/drivers/staging/rtl8188eu/Kconfig
index 9a57d31ed248..e45c106c2162 100644
--- a/drivers/staging/rtl8188eu/Kconfig
+++ b/drivers/staging/rtl8188eu/Kconfig
@@ -3,7 +3,6 @@ config R8188EU
3 depends on WLAN && USB 3 depends on WLAN && USB
4 select WIRELESS_EXT 4 select WIRELESS_EXT
5 select WEXT_PRIV 5 select WEXT_PRIV
6 default N
7 ---help--- 6 ---help---
8 This option adds the Realtek RTL8188EU USB device such as TP-Link TL-WN725N. 7 This option adds the Realtek RTL8188EU USB device such as TP-Link TL-WN725N.
9 If built as a module, it will be called r8188eu. 8 If built as a module, it will be called r8188eu.
diff --git a/drivers/staging/rtl8192e/rtl8192e/Kconfig b/drivers/staging/rtl8192e/rtl8192e/Kconfig
index 50e0d91a409a..ad82bc348a75 100644
--- a/drivers/staging/rtl8192e/rtl8192e/Kconfig
+++ b/drivers/staging/rtl8192e/rtl8192e/Kconfig
@@ -5,5 +5,4 @@ config RTL8192E
5 select WIRELESS_EXT 5 select WIRELESS_EXT
6 select WEXT_PRIV 6 select WEXT_PRIV
7 select CRYPTO 7 select CRYPTO
8 default N
9 ---help--- 8 ---help---
diff --git a/drivers/staging/rtl8192u/Kconfig b/drivers/staging/rtl8192u/Kconfig
index 3f055091b35f..3ee9d0d00fb6 100644
--- a/drivers/staging/rtl8192u/Kconfig
+++ b/drivers/staging/rtl8192u/Kconfig
@@ -5,5 +5,4 @@ config RTL8192U
5 select WIRELESS_EXT 5 select WIRELESS_EXT
6 select WEXT_PRIV 6 select WEXT_PRIV
7 select CRYPTO 7 select CRYPTO
8 default N
9 ---help--- 8 ---help---
diff --git a/drivers/staging/rtl8712/Kconfig b/drivers/staging/rtl8712/Kconfig
index 6a43312380e0..f160eee52f09 100644
--- a/drivers/staging/rtl8712/Kconfig
+++ b/drivers/staging/rtl8712/Kconfig
@@ -4,7 +4,6 @@ config R8712U
4 select WIRELESS_EXT 4 select WIRELESS_EXT
5 select WEXT_PRIV 5 select WEXT_PRIV
6 select FW_LOADER 6 select FW_LOADER
7 default N
8 ---help--- 7 ---help---
9 This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130. 8 This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130.
10 If built as a module, it will be called r8712u. 9 If built as a module, it will be called r8712u.
@@ -12,7 +11,6 @@ config R8712U
12config R8712_TX_AGGR 11config R8712_TX_AGGR
13 bool "Realtek RTL8712U Transmit Aggregation code" 12 bool "Realtek RTL8712U Transmit Aggregation code"
14 depends on R8712U && BROKEN 13 depends on R8712U && BROKEN
15 default N
16 ---help--- 14 ---help---
17 This option provides transmit aggregation for the Realtek RTL8712 USB device. 15 This option provides transmit aggregation for the Realtek RTL8712 USB device.
18 16
diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig
index 886000980474..bd99e9e47e50 100644
--- a/drivers/staging/usbip/Kconfig
+++ b/drivers/staging/usbip/Kconfig
@@ -1,7 +1,6 @@
1config USBIP_CORE 1config USBIP_CORE
2 tristate "USB/IP support" 2 tristate "USB/IP support"
3 depends on USB && NET 3 depends on USB && NET
4 default N
5 ---help--- 4 ---help---
6 This enables pushing USB packets over IP to allow remote 5 This enables pushing USB packets over IP to allow remote
7 machines direct access to USB devices. It provides the 6 machines direct access to USB devices. It provides the
@@ -18,7 +17,6 @@ config USBIP_CORE
18config USBIP_VHCI_HCD 17config USBIP_VHCI_HCD
19 tristate "VHCI hcd" 18 tristate "VHCI hcd"
20 depends on USBIP_CORE 19 depends on USBIP_CORE
21 default N
22 ---help--- 20 ---help---
23 This enables the USB/IP virtual host controller driver, 21 This enables the USB/IP virtual host controller driver,
24 which is run on the remote machine. 22 which is run on the remote machine.
@@ -29,7 +27,6 @@ config USBIP_VHCI_HCD
29config USBIP_HOST 27config USBIP_HOST
30 tristate "Host driver" 28 tristate "Host driver"
31 depends on USBIP_CORE 29 depends on USBIP_CORE
32 default N
33 ---help--- 30 ---help---
34 This enables the USB/IP host driver, which is run on the 31 This enables the USB/IP host driver, which is run on the
35 machine that is sharing the USB devices. 32 machine that is sharing the USB devices.
@@ -40,6 +37,5 @@ config USBIP_HOST
40config USBIP_DEBUG 37config USBIP_DEBUG
41 bool "Debug messages for USB/IP" 38 bool "Debug messages for USB/IP"
42 depends on USBIP_CORE 39 depends on USBIP_CORE
43 default N
44 ---help--- 40 ---help---
45 This enables the debug messages from the USB/IP drivers. 41 This enables the debug messages from the USB/IP drivers.
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
11config USB_ANNOUNCE_NEW_DEVICES 11config 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 */
183int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe, 183int 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
315config USB_ISP1362_HCD 315config 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
326config USB_FUSBH200_HCD 325config 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
337config USB_FOTG210_HCD 335config 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