diff options
67 files changed, 70 insertions, 97 deletions
@@ -1229,7 +1229,7 @@ E: philip@gladstonefamily.net | |||
1229 | D: Kernel / timekeeping stuff | 1229 | D: Kernel / timekeeping stuff |
1230 | S: Carlisle, MA 01741 | 1230 | S: Carlisle, MA 01741 |
1231 | S: USA | 1231 | S: USA |
1232 | 1232 | ||
1233 | N: Jan-Benedict Glaw | 1233 | N: Jan-Benedict Glaw |
1234 | E: jbglaw@lug-owl.de | 1234 | E: jbglaw@lug-owl.de |
1235 | D: SRM environment driver (for Alpha systems) | 1235 | D: SRM environment driver (for Alpha systems) |
@@ -2560,7 +2560,7 @@ S: 22 Seaview St | |||
2560 | S: Fullarton 5063 | 2560 | S: Fullarton 5063 |
2561 | S: South Australia | 2561 | S: South Australia |
2562 | 2562 | ||
2563 | N. Wolfgang Muees | 2563 | N: Wolfgang Muees |
2564 | E: wolfgang@iksw-muees.de | 2564 | E: wolfgang@iksw-muees.de |
2565 | D: Auerswald USB driver | 2565 | D: Auerswald USB driver |
2566 | 2566 | ||
diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml index a9b15e34c5b2..24c22cabc668 100644 --- a/Documentation/DocBook/media/dvb/dvbproperty.xml +++ b/Documentation/DocBook/media/dvb/dvbproperty.xml | |||
@@ -196,7 +196,7 @@ get/set up to 64 properties. The actual meaning of each property is described on | |||
196 | <para>1)For satellital delivery systems, it is measured in kHz. | 196 | <para>1)For satellital delivery systems, it is measured in kHz. |
197 | For the other ones, it is measured in Hz.</para> | 197 | For the other ones, it is measured in Hz.</para> |
198 | <para>2)For ISDB-T, the channels are usually transmitted with an offset of 143kHz. | 198 | <para>2)For ISDB-T, the channels are usually transmitted with an offset of 143kHz. |
199 | E.g. a valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of | 199 | E.g. a valid frequency could be 474143 kHz. The stepping is bound to the bandwidth of |
200 | the channel which is 6MHz.</para> | 200 | the channel which is 6MHz.</para> |
201 | 201 | ||
202 | <para>3)As in ISDB-Tsb the channel consists of only one or three segments the | 202 | <para>3)As in ISDB-Tsb the channel consists of only one or three segments the |
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index c4cac6dbf9af..86c6dd2f6b8a 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml | |||
@@ -397,7 +397,7 @@ linkend="control" />.</para> | |||
397 | 397 | ||
398 | <para>The <structfield>depth</structfield> (average number of | 398 | <para>The <structfield>depth</structfield> (average number of |
399 | bits per pixel) of a video image is implied by the selected image | 399 | bits per pixel) of a video image is implied by the selected image |
400 | format. V4L2 does not explicitely provide such information assuming | 400 | format. V4L2 does not explicitly provide such information assuming |
401 | applications recognizing the format are aware of the image depth and | 401 | applications recognizing the format are aware of the image depth and |
402 | others need not know. The <structfield>palette</structfield> field | 402 | others need not know. The <structfield>palette</structfield> field |
403 | moved into the &v4l2-pix-format;:<informaltable> | 403 | moved into the &v4l2-pix-format;:<informaltable> |
diff --git a/Documentation/DocBook/media_api.tmpl b/Documentation/DocBook/media_api.tmpl index 4c8d282545a2..ab56f89c8642 100644 --- a/Documentation/DocBook/media_api.tmpl +++ b/Documentation/DocBook/media_api.tmpl | |||
@@ -58,7 +58,7 @@ Foundation. A copy of the license is included in the chapter entitled | |||
58 | <title>Introduction</title> | 58 | <title>Introduction</title> |
59 | 59 | ||
60 | <para>This document covers the Linux Kernel to Userspace API's used by | 60 | <para>This document covers the Linux Kernel to Userspace API's used by |
61 | video and radio straming devices, including video cameras, | 61 | video and radio streaming devices, including video cameras, |
62 | analog and digital TV receiver cards, AM/FM receiver cards, | 62 | analog and digital TV receiver cards, AM/FM receiver cards, |
63 | streaming capture devices.</para> | 63 | streaming capture devices.</para> |
64 | <para>It is divided into four parts.</para> | 64 | <para>It is divided into four parts.</para> |
diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt index 4c95935cbcf4..aff22113a986 100644 --- a/Documentation/filesystems/autofs4-mount-control.txt +++ b/Documentation/filesystems/autofs4-mount-control.txt | |||
@@ -255,7 +255,7 @@ AUTOFS_DEV_IOCTL_OPENMOUNT and AUTOFS_DEV_IOCTL_CLOSEMOUNT | |||
255 | 255 | ||
256 | Obtain and release a file descriptor for an autofs managed mount point | 256 | Obtain and release a file descriptor for an autofs managed mount point |
257 | path. The open call requires an initialized struct autofs_dev_ioctl with | 257 | path. The open call requires an initialized struct autofs_dev_ioctl with |
258 | the the path field set and the size field adjusted appropriately as well | 258 | the path field set and the size field adjusted appropriately as well |
259 | as the arg1 field set to the device number of the autofs mount. The | 259 | as the arg1 field set to the device number of the autofs mount. The |
260 | device number can be obtained from the mount options shown in | 260 | device number can be obtained from the mount options shown in |
261 | /proc/mounts. The close call requires an initialized struct | 261 | /proc/mounts. The close call requires an initialized struct |
diff --git a/Documentation/filesystems/hfsplus.txt b/Documentation/filesystems/hfsplus.txt index af1628a1061c..59f7569fc9ed 100644 --- a/Documentation/filesystems/hfsplus.txt +++ b/Documentation/filesystems/hfsplus.txt | |||
@@ -56,4 +56,4 @@ References | |||
56 | 56 | ||
57 | kernel source: <file:fs/hfsplus> | 57 | kernel source: <file:fs/hfsplus> |
58 | 58 | ||
59 | Apple Technote 1150 http://developer.apple.com/technotes/tn/tn1150.html | 59 | Apple Technote 1150 https://developer.apple.com/legacy/library/technotes/tn/tn1150.html |
diff --git a/Documentation/futex-requeue-pi.txt b/Documentation/futex-requeue-pi.txt index 9dc1ff4fd536..31b16610c416 100644 --- a/Documentation/futex-requeue-pi.txt +++ b/Documentation/futex-requeue-pi.txt | |||
@@ -67,7 +67,7 @@ pthread_cond_wait_pi(cond, mutex) | |||
67 | lock(cond->__data.__lock); | 67 | lock(cond->__data.__lock); |
68 | } while(...) | 68 | } while(...) |
69 | unlock(cond->__data.__lock); | 69 | unlock(cond->__data.__lock); |
70 | /* the kernel acquired the the mutex for us */ | 70 | /* the kernel acquired the mutex for us */ |
71 | } | 71 | } |
72 | 72 | ||
73 | pthread_cond_broadcast_pi(cond) | 73 | pthread_cond_broadcast_pi(cond) |
diff --git a/Documentation/input/multi-touch-protocol.txt b/Documentation/input/multi-touch-protocol.txt index de139b18184a..7b4f59c09ee2 100644 --- a/Documentation/input/multi-touch-protocol.txt +++ b/Documentation/input/multi-touch-protocol.txt | |||
@@ -372,7 +372,7 @@ simple scheme, which is compatible with earlier usage, is: | |||
372 | 372 | ||
373 | Rationale: We have no information about the orientation of the touching | 373 | Rationale: We have no information about the orientation of the touching |
374 | ellipse, so approximate it with an inscribed circle instead. The tool | 374 | ellipse, so approximate it with an inscribed circle instead. The tool |
375 | ellipse should align with the the vector (T - C), so the diameter must | 375 | ellipse should align with the vector (T - C), so the diameter must |
376 | increase with distance(T, C). Finally, assume that the touch diameter is | 376 | increase with distance(T, C). Finally, assume that the touch diameter is |
377 | equal to the tool thickness, and we arrive at the formulas above. | 377 | equal to the tool thickness, and we arrive at the formulas above. |
378 | 378 | ||
diff --git a/Documentation/kmemcheck.txt b/Documentation/kmemcheck.txt index 9398a501fdb9..a41bdebbe87b 100644 --- a/Documentation/kmemcheck.txt +++ b/Documentation/kmemcheck.txt | |||
@@ -541,7 +541,7 @@ initialized. This is the beginning of the struct: | |||
541 | 92 } _sifields; | 541 | 92 } _sifields; |
542 | 93 } siginfo_t; | 542 | 93 } siginfo_t; |
543 | 543 | ||
544 | On 64-bit, the int is 4 bytes long, so it must the the union member that has | 544 | On 64-bit, the int is 4 bytes long, so it must the union member that has |
545 | not been initialized. We can verify this using gdb: | 545 | not been initialized. We can verify this using gdb: |
546 | 546 | ||
547 | $ gdb vmlinux | 547 | $ gdb vmlinux |
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index 11c1d2049662..556f951f8626 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt | |||
@@ -1401,7 +1401,7 @@ code. Here are some examples of these sorts of optimizations: | |||
1401 | process_message(msg); | 1401 | process_message(msg); |
1402 | } | 1402 | } |
1403 | 1403 | ||
1404 | There is nothing to prevent the the compiler from transforming | 1404 | There is nothing to prevent the compiler from transforming |
1405 | process_level() to the following, in fact, this might well be a | 1405 | process_level() to the following, in fact, this might well be a |
1406 | win for single-threaded code: | 1406 | win for single-threaded code: |
1407 | 1407 | ||
diff --git a/Documentation/module-signing.txt b/Documentation/module-signing.txt index 2b40e04d3c49..09b583e38907 100644 --- a/Documentation/module-signing.txt +++ b/Documentation/module-signing.txt | |||
@@ -77,11 +77,11 @@ This has a number of options available: | |||
77 | This presents a choice of which hash algorithm the installation phase will | 77 | This presents a choice of which hash algorithm the installation phase will |
78 | sign the modules with: | 78 | sign the modules with: |
79 | 79 | ||
80 | CONFIG_SIG_SHA1 "Sign modules with SHA-1" | 80 | CONFIG_MODULE_SIG_SHA1 "Sign modules with SHA-1" |
81 | CONFIG_SIG_SHA224 "Sign modules with SHA-224" | 81 | CONFIG_MODULE_SIG_SHA224 "Sign modules with SHA-224" |
82 | CONFIG_SIG_SHA256 "Sign modules with SHA-256" | 82 | CONFIG_MODULE_SIG_SHA256 "Sign modules with SHA-256" |
83 | CONFIG_SIG_SHA384 "Sign modules with SHA-384" | 83 | CONFIG_MODULE_SIG_SHA384 "Sign modules with SHA-384" |
84 | CONFIG_SIG_SHA512 "Sign modules with SHA-512" | 84 | CONFIG_MODULE_SIG_SHA512 "Sign modules with SHA-512" |
85 | 85 | ||
86 | The algorithm selected here will also be built into the kernel (rather | 86 | The algorithm selected here will also be built into the kernel (rather |
87 | than being a module) so that modules signed with that algorithm can have | 87 | than being a module) so that modules signed with that algorithm can have |
diff --git a/Documentation/networking/spider_net.txt b/Documentation/networking/spider_net.txt index 4b4adb8eb14f..b0b75f8463b3 100644 --- a/Documentation/networking/spider_net.txt +++ b/Documentation/networking/spider_net.txt | |||
@@ -73,7 +73,7 @@ Thus, in an idle system, the GDACTDPA, tail and head pointers will | |||
73 | all be pointing at the same descr, which should be "empty". All of the | 73 | all be pointing at the same descr, which should be "empty". All of the |
74 | other descrs in the ring should be "empty" as well. | 74 | other descrs in the ring should be "empty" as well. |
75 | 75 | ||
76 | The show_rx_chain() routine will print out the the locations of the | 76 | The show_rx_chain() routine will print out the locations of the |
77 | GDACTDPA, tail and head pointers. It will also summarize the contents | 77 | GDACTDPA, tail and head pointers. It will also summarize the contents |
78 | of the ring, starting at the tail pointer, and listing the status | 78 | of the ring, starting at the tail pointer, and listing the status |
79 | of the descrs that follow. | 79 | of the descrs that follow. |
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt index a66c9821b5ce..47d46dff70f7 100644 --- a/Documentation/power/devices.txt +++ b/Documentation/power/devices.txt | |||
@@ -391,7 +391,7 @@ When resuming from freeze, standby or memory sleep, the phases are: | |||
391 | the resume methods. This generally involves undoing the actions of the | 391 | the resume methods. This generally involves undoing the actions of the |
392 | preceding suspend_late phase. | 392 | preceding suspend_late phase. |
393 | 393 | ||
394 | 3 The resume methods should bring the the device back to its operating | 394 | 3 The resume methods should bring the device back to its operating |
395 | state, so that it can perform normal I/O. This generally involves | 395 | state, so that it can perform normal I/O. This generally involves |
396 | undoing the actions of the suspend phase. | 396 | undoing the actions of the suspend phase. |
397 | 397 | ||
diff --git a/Documentation/security/Smack.txt b/Documentation/security/Smack.txt index 7a2d30c132e3..5ea996f21d6c 100644 --- a/Documentation/security/Smack.txt +++ b/Documentation/security/Smack.txt | |||
@@ -3,7 +3,7 @@ | |||
3 | "Good for you, you've decided to clean the elevator!" | 3 | "Good for you, you've decided to clean the elevator!" |
4 | - The Elevator, from Dark Star | 4 | - The Elevator, from Dark Star |
5 | 5 | ||
6 | Smack is the the Simplified Mandatory Access Control Kernel. | 6 | Smack is the Simplified Mandatory Access Control Kernel. |
7 | Smack is a kernel based implementation of mandatory access | 7 | Smack is a kernel based implementation of mandatory access |
8 | control that includes simplicity in its primary design goals. | 8 | control that includes simplicity in its primary design goals. |
9 | 9 | ||
diff --git a/Documentation/trace/ring-buffer-design.txt b/Documentation/trace/ring-buffer-design.txt index 7d350b496585..ff747b6fa39b 100644 --- a/Documentation/trace/ring-buffer-design.txt +++ b/Documentation/trace/ring-buffer-design.txt | |||
@@ -683,7 +683,7 @@ against nested writers. | |||
683 | cmpxchg(tail_page, temp_page, next_page) | 683 | cmpxchg(tail_page, temp_page, next_page) |
684 | 684 | ||
685 | The above will update the tail page if it is still pointing to the expected | 685 | The above will update the tail page if it is still pointing to the expected |
686 | page. If this fails, a nested write pushed it forward, the the current write | 686 | page. If this fails, a nested write pushed it forward, the current write |
687 | does not need to push it. | 687 | does not need to push it. |
688 | 688 | ||
689 | 689 | ||
diff --git a/Documentation/usb/WUSB-Design-overview.txt b/Documentation/usb/WUSB-Design-overview.txt index 4c5e37939344..1cd07c017cf6 100644 --- a/Documentation/usb/WUSB-Design-overview.txt +++ b/Documentation/usb/WUSB-Design-overview.txt | |||
@@ -25,7 +25,7 @@ updated content. | |||
25 | * Design-overview.txt-1.8 | 25 | * Design-overview.txt-1.8 |
26 | 26 | ||
27 | This code implements a Ultra Wide Band stack for Linux, as well as | 27 | This code implements a Ultra Wide Band stack for Linux, as well as |
28 | drivers for the the USB based UWB radio controllers defined in the | 28 | drivers for the USB based UWB radio controllers defined in the |
29 | Wireless USB 1.0 specification (including Wireless USB host controller | 29 | Wireless USB 1.0 specification (including Wireless USB host controller |
30 | and an Intel WiNET controller). | 30 | and an Intel WiNET controller). |
31 | 31 | ||
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index c24211da4120..a9380ba54c8e 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt | |||
@@ -1491,7 +1491,7 @@ struct kvm_lapic_state { | |||
1491 | char regs[KVM_APIC_REG_SIZE]; | 1491 | char regs[KVM_APIC_REG_SIZE]; |
1492 | }; | 1492 | }; |
1493 | 1493 | ||
1494 | Copies the input argument into the the Local APIC registers. The data format | 1494 | Copies the input argument into the Local APIC registers. The data format |
1495 | and layout are the same as documented in the architecture manual. | 1495 | and layout are the same as documented in the architecture manual. |
1496 | 1496 | ||
1497 | 1497 | ||
diff --git a/Documentation/vm/unevictable-lru.txt b/Documentation/vm/unevictable-lru.txt index a68db7692ee8..744f82f86c58 100644 --- a/Documentation/vm/unevictable-lru.txt +++ b/Documentation/vm/unevictable-lru.txt | |||
@@ -453,7 +453,7 @@ putback_lru_page() function to add migrated pages back to the LRU. | |||
453 | mmap(MAP_LOCKED) SYSTEM CALL HANDLING | 453 | mmap(MAP_LOCKED) SYSTEM CALL HANDLING |
454 | ------------------------------------- | 454 | ------------------------------------- |
455 | 455 | ||
456 | In addition the the mlock()/mlockall() system calls, an application can request | 456 | In addition the mlock()/mlockall() system calls, an application can request |
457 | that a region of memory be mlocked supplying the MAP_LOCKED flag to the mmap() | 457 | that a region of memory be mlocked supplying the MAP_LOCKED flag to the mmap() |
458 | call. Furthermore, any mmap() call or brk() call that expands the heap by a | 458 | call. Furthermore, any mmap() call or brk() call that expands the heap by a |
459 | task that has previously called mlockall() with the MCL_FUTURE flag will result | 459 | task that has previously called mlockall() with the MCL_FUTURE flag will result |
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 9be30c8cb0c2..75de197a2fef 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig | |||
@@ -356,7 +356,6 @@ config ARC_CURR_IN_REG | |||
356 | 356 | ||
357 | config ARC_MISALIGN_ACCESS | 357 | config ARC_MISALIGN_ACCESS |
358 | bool "Emulate unaligned memory access (userspace only)" | 358 | bool "Emulate unaligned memory access (userspace only)" |
359 | default N | ||
360 | select SYSCTL_ARCH_UNALIGN_NO_WARN | 359 | select SYSCTL_ARCH_UNALIGN_NO_WARN |
361 | select SYSCTL_ARCH_UNALIGN_ALLOW | 360 | select SYSCTL_ARCH_UNALIGN_ALLOW |
362 | help | 361 | help |
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig index ac1710e64d9a..308d5b5b3055 100644 --- a/arch/arm/mach-spear/Kconfig +++ b/arch/arm/mach-spear/Kconfig | |||
@@ -92,7 +92,7 @@ config MACH_SPEAR600 | |||
92 | depends on ARCH_SPEAR6XX | 92 | depends on ARCH_SPEAR6XX |
93 | select USE_OF | 93 | select USE_OF |
94 | help | 94 | help |
95 | Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig" | 95 | Supports ST SPEAr600 boards configured via the device-tree |
96 | 96 | ||
97 | config ARCH_SPEAR_AUTO | 97 | config ARCH_SPEAR_AUTO |
98 | def_bool PLAT_SPEAR_SINGLE | 98 | def_bool PLAT_SPEAR_SINGLE |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index 6792503aaf79..15a9ed1d579c 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -11,7 +11,6 @@ config ETRAX_ETHERNET | |||
11 | config ETRAX_NO_PHY | 11 | config ETRAX_NO_PHY |
12 | bool "PHY not present" | 12 | bool "PHY not present" |
13 | depends on ETRAX_ETHERNET | 13 | depends on ETRAX_ETHERNET |
14 | default N | ||
15 | help | 14 | help |
16 | This option disables all MDIO communication with an ethernet | 15 | This option disables all MDIO communication with an ethernet |
17 | transceiver connected to the MII interface. This option shall | 16 | transceiver connected to the MII interface. This option shall |
@@ -116,7 +115,6 @@ config ETRAX_AXISFLASHMAP | |||
116 | config ETRAX_AXISFLASHMAP_MTD0WHOLE | 115 | config ETRAX_AXISFLASHMAP_MTD0WHOLE |
117 | bool "MTD0 is whole boot flash device" | 116 | bool "MTD0 is whole boot flash device" |
118 | depends on ETRAX_AXISFLASHMAP | 117 | depends on ETRAX_AXISFLASHMAP |
119 | default N | ||
120 | help | 118 | help |
121 | When this option is not set, mtd0 refers to the first partition | 119 | When this option is not set, mtd0 refers to the first partition |
122 | on the boot flash device. When set, mtd0 refers to the whole | 120 | on the boot flash device. When set, mtd0 refers to the whole |
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h index d42625053c37..096339207764 100644 --- a/arch/s390/include/asm/cio.h +++ b/arch/s390/include/asm/cio.h | |||
@@ -199,7 +199,7 @@ struct esw_eadm { | |||
199 | /** | 199 | /** |
200 | * struct irb - interruption response block | 200 | * struct irb - interruption response block |
201 | * @scsw: subchannel status word | 201 | * @scsw: subchannel status word |
202 | * @esw: extened status word | 202 | * @esw: extended status word |
203 | * @ecw: extended control word | 203 | * @ecw: extended control word |
204 | * | 204 | * |
205 | * The irb that is handed to the device driver when an interrupt occurs. For | 205 | * The irb that is handed to the device driver when an interrupt occurs. For |
diff --git a/block/blk-core.c b/block/blk-core.c index e45b321cf6a0..34d7c196338b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -1928,7 +1928,7 @@ EXPORT_SYMBOL(submit_bio); | |||
1928 | * in some cases below, so export this function. | 1928 | * in some cases below, so export this function. |
1929 | * Request stacking drivers like request-based dm may change the queue | 1929 | * Request stacking drivers like request-based dm may change the queue |
1930 | * limits while requests are in the queue (e.g. dm's table swapping). | 1930 | * limits while requests are in the queue (e.g. dm's table swapping). |
1931 | * Such request stacking drivers should check those requests agaist | 1931 | * Such request stacking drivers should check those requests against |
1932 | * the new queue limits again when they dispatch those requests, | 1932 | * the new queue limits again when they dispatch those requests, |
1933 | * although such checkings are also done against the old queue limits | 1933 | * although such checkings are also done against the old queue limits |
1934 | * when submitting requests. | 1934 | * when submitting requests. |
diff --git a/block/blk-map.c b/block/blk-map.c index ae4ae1047fd9..cca6356d216d 100644 --- a/block/blk-map.c +++ b/block/blk-map.c | |||
@@ -285,7 +285,7 @@ EXPORT_SYMBOL(blk_rq_unmap_user); | |||
285 | * | 285 | * |
286 | * Description: | 286 | * Description: |
287 | * Data will be mapped directly if possible. Otherwise a bounce | 287 | * Data will be mapped directly if possible. Otherwise a bounce |
288 | * buffer is used. Can be called multple times to append multple | 288 | * buffer is used. Can be called multiple times to append multiple |
289 | * buffers. | 289 | * buffers. |
290 | */ | 290 | */ |
291 | int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, | 291 | int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, |
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 | |||
245 | endmenu | 246 | endmenu |
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 | */ |
242 | void sparse_keymap_free(struct input_dev *dev) | 242 | void 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 | */ |
1231 | struct iscsi_bus_flash_session * | 1231 | struct 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 | ||
3 | config ANDROID | 3 | config 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 | ||
74 | config ANDROID_LOW_MEMORY_KILLER | 73 | config 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 @@ | |||
1 | config BCM_WIMAX | 1 | config 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 @@ | |||
1 | config TRANZPORT | 1 | config 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 | |||
24 | config VIDEO_GO7007_USB | 23 | config 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 | |||
46 | config VIDEO_GO7007_USB_S2250_BOARD | 44 | config 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 | |||
12 | config R8712_TX_AGGR | 11 | config 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 @@ | |||
1 | config USBIP_CORE | 1 | config 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 | |||
18 | config USBIP_VHCI_HCD | 17 | config 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 | |||
29 | config USBIP_HOST | 27 | config 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 | |||
40 | config USBIP_DEBUG | 37 | config 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 | ||
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 |
diff --git a/fs/buffer.c b/fs/buffer.c index 27265a8b43c1..8c53a2b15ecb 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -3088,7 +3088,7 @@ EXPORT_SYMBOL(submit_bh); | |||
3088 | * until the buffer gets unlocked). | 3088 | * until the buffer gets unlocked). |
3089 | * | 3089 | * |
3090 | * ll_rw_block sets b_end_io to simple completion handler that marks | 3090 | * ll_rw_block sets b_end_io to simple completion handler that marks |
3091 | * the buffer up-to-date (if approriate), unlocks the buffer and wakes | 3091 | * the buffer up-to-date (if appropriate), unlocks the buffer and wakes |
3092 | * any waiters. | 3092 | * any waiters. |
3093 | * | 3093 | * |
3094 | * All of the buffers must be for the same device, and must also be a | 3094 | * All of the buffers must be for the same device, and must also be a |
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 9c0444cccbe1..ca4a08f38374 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
@@ -358,7 +358,7 @@ exit: | |||
358 | * @name: a pointer to a string containing the name of the file to create. | 358 | * @name: a pointer to a string containing the name of the file to create. |
359 | * @mode: the permission that the file should have. | 359 | * @mode: the permission that the file should have. |
360 | * @parent: a pointer to the parent dentry for this file. This should be a | 360 | * @parent: a pointer to the parent dentry for this file. This should be a |
361 | * directory dentry if set. If this paramater is NULL, then the | 361 | * directory dentry if set. If this parameter is NULL, then the |
362 | * file will be created in the root of the debugfs filesystem. | 362 | * file will be created in the root of the debugfs filesystem. |
363 | * @data: a pointer to something that the caller will want to get to later | 363 | * @data: a pointer to something that the caller will want to get to later |
364 | * on. The inode.i_private pointer will point to this value on | 364 | * on. The inode.i_private pointer will point to this value on |
@@ -400,7 +400,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_file); | |||
400 | * @name: a pointer to a string containing the name of the directory to | 400 | * @name: a pointer to a string containing the name of the directory to |
401 | * create. | 401 | * create. |
402 | * @parent: a pointer to the parent dentry for this file. This should be a | 402 | * @parent: a pointer to the parent dentry for this file. This should be a |
403 | * directory dentry if set. If this paramater is NULL, then the | 403 | * directory dentry if set. If this parameter is NULL, then the |
404 | * directory will be created in the root of the debugfs filesystem. | 404 | * directory will be created in the root of the debugfs filesystem. |
405 | * | 405 | * |
406 | * This function creates a directory in debugfs with the given name. | 406 | * This function creates a directory in debugfs with the given name. |
@@ -425,7 +425,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir); | |||
425 | * @name: a pointer to a string containing the name of the symbolic link to | 425 | * @name: a pointer to a string containing the name of the symbolic link to |
426 | * create. | 426 | * create. |
427 | * @parent: a pointer to the parent dentry for this symbolic link. This | 427 | * @parent: a pointer to the parent dentry for this symbolic link. This |
428 | * should be a directory dentry if set. If this paramater is NULL, | 428 | * should be a directory dentry if set. If this parameter is NULL, |
429 | * then the symbolic link will be created in the root of the debugfs | 429 | * then the symbolic link will be created in the root of the debugfs |
430 | * filesystem. | 430 | * filesystem. |
431 | * @target: a pointer to a string containing the path to the target of the | 431 | * @target: a pointer to a string containing the path to the target of the |
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 471f276ce8f7..0145b948b147 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h | |||
@@ -55,7 +55,7 @@ struct drm_fb_helper_surface_size { | |||
55 | * save the current lut when force-restoring the fbdev for e.g. | 55 | * save the current lut when force-restoring the fbdev for e.g. |
56 | * kdbg. | 56 | * kdbg. |
57 | * @fb_probe: Driver callback to allocate and initialize the fbdev info | 57 | * @fb_probe: Driver callback to allocate and initialize the fbdev info |
58 | * structure. Futhermore it also needs to allocate the drm | 58 | * structure. Furthermore it also needs to allocate the drm |
59 | * framebuffer used to back the fbdev. | 59 | * framebuffer used to back the fbdev. |
60 | * @initial_config: Setup an initial fbdev display configuration | 60 | * @initial_config: Setup an initial fbdev display configuration |
61 | * | 61 | * |
diff --git a/include/linux/gpio.h b/include/linux/gpio.h index b581b13d29d9..85aa5d0b9357 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/errno.h> | 4 | #include <linux/errno.h> |
5 | 5 | ||
6 | /* see Documentation/gpio.txt */ | 6 | /* see Documentation/gpio/gpio-legacy.txt */ |
7 | 7 | ||
8 | /* make these flag values available regardless of GPIO kconfig options */ | 8 | /* make these flag values available regardless of GPIO kconfig options */ |
9 | #define GPIOF_DIR_OUT (0 << 0) | 9 | #define GPIOF_DIR_OUT (0 << 0) |
diff --git a/include/linux/hsi/hsi.h b/include/linux/hsi/hsi.h index 0dca785288cf..39bfd5b89077 100644 --- a/include/linux/hsi/hsi.h +++ b/include/linux/hsi/hsi.h | |||
@@ -178,7 +178,7 @@ static inline void hsi_unregister_client_driver(struct hsi_client_driver *drv) | |||
178 | * @complete: Transfer completion callback | 178 | * @complete: Transfer completion callback |
179 | * @destructor: Destructor to free resources when flushing | 179 | * @destructor: Destructor to free resources when flushing |
180 | * @status: Status of the transfer when completed | 180 | * @status: Status of the transfer when completed |
181 | * @actual_len: Actual length of data transfered on completion | 181 | * @actual_len: Actual length of data transferred on completion |
182 | * @channel: Channel were to TX/RX the message | 182 | * @channel: Channel were to TX/RX the message |
183 | * @ttype: Transfer type (TX if set, RX otherwise) | 183 | * @ttype: Transfer type (TX if set, RX otherwise) |
184 | * @break_frame: if true HSI will send/receive a break frame. Data buffers are | 184 | * @break_frame: if true HSI will send/receive a break frame. Data buffers are |
diff --git a/include/linux/idr.h b/include/linux/idr.h index 9c95d210458b..f669585c4fc5 100644 --- a/include/linux/idr.h +++ b/include/linux/idr.h | |||
@@ -82,7 +82,6 @@ int idr_for_each(struct idr *idp, | |||
82 | void *idr_get_next(struct idr *idp, int *nextid); | 82 | void *idr_get_next(struct idr *idp, int *nextid); |
83 | void *idr_replace(struct idr *idp, void *ptr, int id); | 83 | void *idr_replace(struct idr *idp, void *ptr, int id); |
84 | void idr_remove(struct idr *idp, int id); | 84 | void idr_remove(struct idr *idp, int id); |
85 | void idr_free(struct idr *idp, int id); | ||
86 | void idr_destroy(struct idr *idp); | 85 | void idr_destroy(struct idr *idp); |
87 | void idr_init(struct idr *idp); | 86 | void idr_init(struct idr *idp); |
88 | bool idr_is_empty(struct idr *idp); | 87 | bool idr_is_empty(struct idr *idp); |
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 552d51efb429..554fde3a3927 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h | |||
@@ -722,7 +722,7 @@ __kfifo_uint_must_check_helper( \ | |||
722 | /** | 722 | /** |
723 | * kfifo_dma_out_finish - finish a DMA OUT operation | 723 | * kfifo_dma_out_finish - finish a DMA OUT operation |
724 | * @fifo: address of the fifo to be used | 724 | * @fifo: address of the fifo to be used |
725 | * @len: number of bytes transferd | 725 | * @len: number of bytes transferrd |
726 | * | 726 | * |
727 | * This macro finish a DMA OUT operation. The out counter will be updated by | 727 | * This macro finish a DMA OUT operation. The out counter will be updated by |
728 | * the len parameter. No error checking will be done. | 728 | * the len parameter. No error checking will be done. |
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index ab5752692113..4d9389c79e61 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h | |||
@@ -35,7 +35,7 @@ struct pipe_buffer { | |||
35 | * @tmp_page: cached released page | 35 | * @tmp_page: cached released page |
36 | * @readers: number of current readers of this pipe | 36 | * @readers: number of current readers of this pipe |
37 | * @writers: number of current writers of this pipe | 37 | * @writers: number of current writers of this pipe |
38 | * @files: number of struct file refering this pipe (protected by ->i_lock) | 38 | * @files: number of struct file referring this pipe (protected by ->i_lock) |
39 | * @waiting_writers: number of writers blocked waiting for room | 39 | * @waiting_writers: number of writers blocked waiting for room |
40 | * @r_counter: reader counter | 40 | * @r_counter: reader counter |
41 | * @w_counter: writer counter | 41 | * @w_counter: writer counter |
diff --git a/include/linux/platform_data/ata-samsung_cf.h b/include/linux/platform_data/ata-samsung_cf.h index 2a3855a8372a..c2049e3d7444 100644 --- a/include/linux/platform_data/ata-samsung_cf.h +++ b/include/linux/platform_data/ata-samsung_cf.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* linux/arch/arm/plat-samsung/include/plat/ata.h | 1 | /* |
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | 2 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. |
4 | * http://www.samsung.com | 3 | * http://www.samsung.com |
5 | * | 4 | * |
@@ -10,8 +9,8 @@ | |||
10 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
11 | */ | 10 | */ |
12 | 11 | ||
13 | #ifndef __ASM_PLAT_ATA_H | 12 | #ifndef __ATA_SAMSUNG_CF_H |
14 | #define __ASM_PLAT_ATA_H __FILE__ | 13 | #define __ATA_SAMSUNG_CF_H __FILE__ |
15 | 14 | ||
16 | /** | 15 | /** |
17 | * struct s3c_ide_platdata - S3C IDE driver platform data. | 16 | * struct s3c_ide_platdata - S3C IDE driver platform data. |
@@ -33,4 +32,4 @@ extern void s3c64xx_ide_setup_gpio(void); | |||
33 | extern void s5pc100_ide_setup_gpio(void); | 32 | extern void s5pc100_ide_setup_gpio(void); |
34 | extern void s5pv210_ide_setup_gpio(void); | 33 | extern void s5pv210_ide_setup_gpio(void); |
35 | 34 | ||
36 | #endif /*__ASM_PLAT_ATA_H */ | 35 | #endif /*__ATA_SAMSUNG_CF_H */ |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 15ede6a823a6..6b8466365fbd 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -2038,7 +2038,7 @@ static inline void skb_propagate_pfmemalloc(struct page *page, | |||
2038 | } | 2038 | } |
2039 | 2039 | ||
2040 | /** | 2040 | /** |
2041 | * skb_frag_page - retrieve the page refered to by a paged fragment | 2041 | * skb_frag_page - retrieve the page referred to by a paged fragment |
2042 | * @frag: the paged fragment | 2042 | * @frag: the paged fragment |
2043 | * | 2043 | * |
2044 | * Returns the &struct page associated with @frag. | 2044 | * Returns the &struct page associated with @frag. |
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 36c86ef51ff3..e713543336f1 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h | |||
@@ -237,7 +237,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) | |||
237 | * @mode_bits: flags understood by this controller driver | 237 | * @mode_bits: flags understood by this controller driver |
238 | * @bits_per_word_mask: A mask indicating which values of bits_per_word are | 238 | * @bits_per_word_mask: A mask indicating which values of bits_per_word are |
239 | * supported by the driver. Bit n indicates that a bits_per_word n+1 is | 239 | * supported by the driver. Bit n indicates that a bits_per_word n+1 is |
240 | * suported. If set, the SPI core will reject any transfer with an | 240 | * supported. If set, the SPI core will reject any transfer with an |
241 | * unsupported bits_per_word. If not set, this value is simply ignored, | 241 | * unsupported bits_per_word. If not set, this value is simply ignored, |
242 | * and it's up to the individual driver to perform any validation. | 242 | * and it's up to the individual driver to perform any validation. |
243 | * @min_speed_hz: Lowest supported transfer speed | 243 | * @min_speed_hz: Lowest supported transfer speed |
@@ -262,7 +262,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) | |||
262 | * @cur_msg: the currently in-flight message | 262 | * @cur_msg: the currently in-flight message |
263 | * @cur_msg_prepared: spi_prepare_message was called for the currently | 263 | * @cur_msg_prepared: spi_prepare_message was called for the currently |
264 | * in-flight message | 264 | * in-flight message |
265 | * @xfer_completion: used by core tranfer_one_message() | 265 | * @xfer_completion: used by core transfer_one_message() |
266 | * @busy: message pump is busy | 266 | * @busy: message pump is busy |
267 | * @running: message pump is running | 267 | * @running: message pump is running |
268 | * @rt: whether this queue is set to run as a realtime task | 268 | * @rt: whether this queue is set to run as a realtime task |
@@ -525,7 +525,7 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum); | |||
525 | * @rx_buf: data to be read (dma-safe memory), or NULL | 525 | * @rx_buf: data to be read (dma-safe memory), or NULL |
526 | * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped | 526 | * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped |
527 | * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped | 527 | * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped |
528 | * @tx_nbits: number of bits used for writting. If 0 the default | 528 | * @tx_nbits: number of bits used for writing. If 0 the default |
529 | * (SPI_NBITS_SINGLE) is used. | 529 | * (SPI_NBITS_SINGLE) is used. |
530 | * @rx_nbits: number of bits used for reading. If 0 the default | 530 | * @rx_nbits: number of bits used for reading. If 0 the default |
531 | * (SPI_NBITS_SINGLE) is used. | 531 | * (SPI_NBITS_SINGLE) is used. |
@@ -585,7 +585,7 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum); | |||
585 | * by the results of previous messages and where the whole transaction | 585 | * by the results of previous messages and where the whole transaction |
586 | * ends when the chipselect goes intactive. | 586 | * ends when the chipselect goes intactive. |
587 | * | 587 | * |
588 | * When SPI can transfer in 1x,2x or 4x. It can get this tranfer information | 588 | * When SPI can transfer in 1x,2x or 4x. It can get this transfer information |
589 | * from device through @tx_nbits and @rx_nbits. In Bi-direction, these | 589 | * from device through @tx_nbits and @rx_nbits. In Bi-direction, these |
590 | * two should both be set. User can set transfer mode with SPI_NBITS_SINGLE(1x) | 590 | * two should both be set. User can set transfer mode with SPI_NBITS_SINGLE(1x) |
591 | * SPI_NBITS_DUAL(2x) and SPI_NBITS_QUAD(4x) to support these three transfer. | 591 | * SPI_NBITS_DUAL(2x) and SPI_NBITS_QUAD(4x) to support these three transfer. |
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index dba63f53906c..d3ca3b53837c 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h | |||
@@ -92,7 +92,7 @@ struct usb_configuration; | |||
92 | * @suspend: Notifies functions when the host stops sending USB traffic. | 92 | * @suspend: Notifies functions when the host stops sending USB traffic. |
93 | * @resume: Notifies functions when the host restarts USB traffic. | 93 | * @resume: Notifies functions when the host restarts USB traffic. |
94 | * @get_status: Returns function status as a reply to | 94 | * @get_status: Returns function status as a reply to |
95 | * GetStatus() request when the recepient is Interface. | 95 | * GetStatus() request when the recipient is Interface. |
96 | * @func_suspend: callback to be called when | 96 | * @func_suspend: callback to be called when |
97 | * SetFeature(FUNCTION_SUSPEND) is reseived | 97 | * SetFeature(FUNCTION_SUSPEND) is reseived |
98 | * | 98 | * |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index f4ab2fb4d50c..703b1f1456fc 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -1895,7 +1895,7 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb); | |||
1895 | * | 1895 | * |
1896 | * Driver informs U-APSD client support by enabling | 1896 | * Driver informs U-APSD client support by enabling |
1897 | * %IEEE80211_HW_SUPPORTS_UAPSD flag. The mode is configured through the | 1897 | * %IEEE80211_HW_SUPPORTS_UAPSD flag. The mode is configured through the |
1898 | * uapsd paramater in conf_tx() operation. Hardware needs to send the QoS | 1898 | * uapsd parameter in conf_tx() operation. Hardware needs to send the QoS |
1899 | * Nullfunc frames and stay awake until the service period has ended. To | 1899 | * Nullfunc frames and stay awake until the service period has ended. To |
1900 | * utilize U-APSD, dynamic powersave is disabled for voip AC and all frames | 1900 | * utilize U-APSD, dynamic powersave is disabled for voip AC and all frames |
1901 | * from that AC are transmitted with powersave enabled. | 1901 | * from that AC are transmitted with powersave enabled. |
@@ -2101,7 +2101,7 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb); | |||
2101 | * with the number of frames to be released and which TIDs they are | 2101 | * with the number of frames to be released and which TIDs they are |
2102 | * to come from. In this case, the driver is responsible for setting | 2102 | * to come from. In this case, the driver is responsible for setting |
2103 | * the EOSP (for uAPSD) and MORE_DATA bits in the released frames, | 2103 | * the EOSP (for uAPSD) and MORE_DATA bits in the released frames, |
2104 | * to help the @more_data paramter is passed to tell the driver if | 2104 | * to help the @more_data parameter is passed to tell the driver if |
2105 | * there is more data on other TIDs -- the TIDs to release frames | 2105 | * there is more data on other TIDs -- the TIDs to release frames |
2106 | * from are ignored since mac80211 doesn't know how many frames the | 2106 | * from are ignored since mac80211 doesn't know how many frames the |
2107 | * buffers for those TIDs contain. | 2107 | * buffers for those TIDs contain. |
@@ -2662,7 +2662,7 @@ enum ieee80211_roc_type { | |||
2662 | * parameters. In the case where the driver buffers some frames for | 2662 | * parameters. In the case where the driver buffers some frames for |
2663 | * sleeping stations mac80211 will use this callback to tell the driver | 2663 | * sleeping stations mac80211 will use this callback to tell the driver |
2664 | * to release some frames, either for PS-poll or uAPSD. | 2664 | * to release some frames, either for PS-poll or uAPSD. |
2665 | * Note that if the @more_data paramter is %false the driver must check | 2665 | * Note that if the @more_data parameter is %false the driver must check |
2666 | * if there are more frames on the given TIDs, and if there are more than | 2666 | * if there are more frames on the given TIDs, and if there are more than |
2667 | * the frames being released then it must still set the more-data bit in | 2667 | * the frames being released then it must still set the more-data bit in |
2668 | * the frame. If the @more_data parameter is %true, then of course the | 2668 | * the frame. If the @more_data parameter is %true, then of course the |
diff --git a/include/uapi/linux/capi.h b/include/uapi/linux/capi.h index 65100d6cb89b..7b145fd7afb6 100644 --- a/include/uapi/linux/capi.h +++ b/include/uapi/linux/capi.h | |||
@@ -102,7 +102,7 @@ typedef struct capi_manufacturer_cmd { | |||
102 | 102 | ||
103 | /* | 103 | /* |
104 | * member contr is input for | 104 | * member contr is input for |
105 | * CAPI_GET_MANUFACTURER, CAPI_VERSION, CAPI_GET_SERIAL | 105 | * CAPI_GET_MANUFACTURER, CAPI_GET_VERSION, CAPI_GET_SERIAL |
106 | * and CAPI_GET_PROFILE | 106 | * and CAPI_GET_PROFILE |
107 | */ | 107 | */ |
108 | typedef union capi_ioctl_struct { | 108 | typedef union capi_ioctl_struct { |
diff --git a/kernel/relay.c b/kernel/relay.c index 5001c9887db1..52d6a6f56261 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
@@ -227,7 +227,7 @@ static void relay_destroy_buf(struct rchan_buf *buf) | |||
227 | * relay_remove_buf - remove a channel buffer | 227 | * relay_remove_buf - remove a channel buffer |
228 | * @kref: target kernel reference that contains the relay buffer | 228 | * @kref: target kernel reference that contains the relay buffer |
229 | * | 229 | * |
230 | * Removes the file from the fileystem, which also frees the | 230 | * Removes the file from the filesystem, which also frees the |
231 | * rchan_buf_struct and the channel buffer. Should only be called from | 231 | * rchan_buf_struct and the channel buffer. Should only be called from |
232 | * kref_put(). | 232 | * kref_put(). |
233 | */ | 233 | */ |
diff --git a/kernel/signal.c b/kernel/signal.c index 52f881db1ca0..5d4b05a229a6 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -2382,7 +2382,7 @@ relock: | |||
2382 | * @regs: user register state | 2382 | * @regs: user register state |
2383 | * @stepping: nonzero if debugger single-step or block-step in use | 2383 | * @stepping: nonzero if debugger single-step or block-step in use |
2384 | * | 2384 | * |
2385 | * This function should be called when a signal has succesfully been | 2385 | * This function should be called when a signal has successfully been |
2386 | * delivered. It updates the blocked signals accordingly (@ka->sa.sa_mask | 2386 | * delivered. It updates the blocked signals accordingly (@ka->sa.sa_mask |
2387 | * is always blocked, and the signal itself is blocked unless %SA_NODEFER | 2387 | * is always blocked, and the signal itself is blocked unless %SA_NODEFER |
2388 | * is set in @ka->sa.sa_flags. Tracing is notified. | 2388 | * is set in @ka->sa.sa_flags. Tracing is notified. |
diff --git a/mm/sparse.c b/mm/sparse.c index 63c3ea5c119c..38cad8fd7397 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
@@ -268,7 +268,7 @@ sparse_early_usemaps_alloc_pgdat_section(struct pglist_data *pgdat, | |||
268 | /* | 268 | /* |
269 | * A page may contain usemaps for other sections preventing the | 269 | * A page may contain usemaps for other sections preventing the |
270 | * page being freed and making a section unremovable while | 270 | * page being freed and making a section unremovable while |
271 | * other sections referencing the usemap retmain active. Similarly, | 271 | * other sections referencing the usemap remain active. Similarly, |
272 | * a pgdat can prevent a section being removed. If section A | 272 | * a pgdat can prevent a section being removed. If section A |
273 | * contains a pgdat and section B contains the usemap, both | 273 | * contains a pgdat and section B contains the usemap, both |
274 | * sections become inter-dependent. This allocates usemaps | 274 | * sections become inter-dependent. This allocates usemaps |
diff --git a/net/core/dev.c b/net/core/dev.c index bc3c89792b0c..4a91591b30a6 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -3446,7 +3446,7 @@ out: | |||
3446 | * @rx_handler: receive handler to register | 3446 | * @rx_handler: receive handler to register |
3447 | * @rx_handler_data: data pointer that is used by rx handler | 3447 | * @rx_handler_data: data pointer that is used by rx handler |
3448 | * | 3448 | * |
3449 | * Register a receive hander for a device. This handler will then be | 3449 | * Register a receive handler for a device. This handler will then be |
3450 | * called from __netif_receive_skb. A negative errno code is returned | 3450 | * called from __netif_receive_skb. A negative errno code is returned |
3451 | * on a failure. | 3451 | * on a failure. |
3452 | * | 3452 | * |
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 93886246a0b4..549043c078c9 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c | |||
@@ -789,7 +789,7 @@ exit: | |||
789 | kobject_put(kobj); | 789 | kobject_put(kobj); |
790 | return error; | 790 | return error; |
791 | } | 791 | } |
792 | #endif /* CONFIG_SYFS */ | 792 | #endif /* CONFIG_SYSFS */ |
793 | 793 | ||
794 | int | 794 | int |
795 | net_rx_queue_update_kobjects(struct net_device *net, int old_num, int new_num) | 795 | net_rx_queue_update_kobjects(struct net_device *net, int old_num, int new_num) |