diff options
109 files changed, 310 insertions, 310 deletions
| @@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer | |||
| 3814 | D: Author of the longest-living linux bug | 3814 | D: Author of the longest-living linux bug |
| 3815 | 3815 | ||
| 3816 | N: Jonathan Woithe | 3816 | N: Jonathan Woithe |
| 3817 | E: jwoithe@physics.adelaide.edu.au | 3817 | E: jwoithe@just42.net |
| 3818 | W: http://www.physics.adelaide.edu.au/~jwoithe | 3818 | W: http:/www.just42.net/jwoithe |
| 3819 | D: ALS-007 sound card extensions to Sound Blaster driver | 3819 | D: ALS-007 sound card extensions to Sound Blaster driver |
| 3820 | S: 20 Jordan St | 3820 | S: 20 Jordan St |
| 3821 | S: Valley View, SA 5093 | 3821 | S: Valley View, SA 5093 |
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb index 6ae9fec8e07d..6df4e6f57560 100644 --- a/Documentation/ABI/testing/sysfs-bus-usb +++ b/Documentation/ABI/testing/sysfs-bus-usb | |||
| @@ -204,7 +204,7 @@ Contact: Matthew Garrett <mjg@redhat.com> | |||
| 204 | Description: | 204 | Description: |
| 205 | Some information about whether a given USB device is | 205 | Some information about whether a given USB device is |
| 206 | physically fixed to the platform can be inferred from a | 206 | physically fixed to the platform can be inferred from a |
| 207 | combination of hub decriptor bits and platform-specific data | 207 | combination of hub descriptor bits and platform-specific data |
| 208 | such as ACPI. This file will read either "removable" or | 208 | such as ACPI. This file will read either "removable" or |
| 209 | "fixed" if the information is available, and "unknown" | 209 | "fixed" if the information is available, and "unknown" |
| 210 | otherwise. \ No newline at end of file | 210 | otherwise. |
diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl index 07a9c48de5a2..eee71426ecb8 100644 --- a/Documentation/DocBook/kernel-hacking.tmpl +++ b/Documentation/DocBook/kernel-hacking.tmpl | |||
| @@ -1289,7 +1289,7 @@ static struct block_device_operations opt_fops = { | |||
| 1289 | * Sparc assembly will do this to ya. | 1289 | * Sparc assembly will do this to ya. |
| 1290 | */ | 1290 | */ |
| 1291 | C_LABEL(cputypvar): | 1291 | C_LABEL(cputypvar): |
| 1292 | .asciz "compatability" | 1292 | .asciz "compatibility" |
| 1293 | 1293 | ||
| 1294 | /* Tested on SS-5, SS-10. Probably someone at Sun applied a spell-checker. */ | 1294 | /* Tested on SS-5, SS-10. Probably someone at Sun applied a spell-checker. */ |
| 1295 | .align 4 | 1295 | .align 4 |
diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl index 31df1aa00710..deb71baed328 100644 --- a/Documentation/DocBook/libata.tmpl +++ b/Documentation/DocBook/libata.tmpl | |||
| @@ -918,7 +918,7 @@ and other resources, etc. | |||
| 918 | <title>HSM violation</title> | 918 | <title>HSM violation</title> |
| 919 | <para> | 919 | <para> |
| 920 | This error is indicated when STATUS value doesn't match HSM | 920 | This error is indicated when STATUS value doesn't match HSM |
| 921 | requirement during issuing or excution any ATA/ATAPI command. | 921 | requirement during issuing or execution any ATA/ATAPI command. |
| 922 | </para> | 922 | </para> |
| 923 | 923 | ||
| 924 | <itemizedlist> | 924 | <itemizedlist> |
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index b84f25e9cc87..dd03cf4a6539 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml | |||
| @@ -2023,7 +2023,7 @@ Possible values are:</entry> | |||
| 2023 | <entry>integer</entry> | 2023 | <entry>integer</entry> |
| 2024 | </row> | 2024 | </row> |
| 2025 | <row><entry spanname="descr">Cyclic intra macroblock refresh. This is the number of continuous macroblocks | 2025 | <row><entry spanname="descr">Cyclic intra macroblock refresh. This is the number of continuous macroblocks |
| 2026 | refreshed every frame. Each frame a succesive set of macroblocks is refreshed until the cycle completes and starts from the | 2026 | refreshed every frame. Each frame a successive set of macroblocks is refreshed until the cycle completes and starts from the |
| 2027 | top of the frame. Applicable to H264, H263 and MPEG4 encoder.</entry> | 2027 | top of the frame. Applicable to H264, H263 and MPEG4 encoder.</entry> |
| 2028 | </row> | 2028 | </row> |
| 2029 | 2029 | ||
| @@ -2183,7 +2183,7 @@ Applicable to the MPEG4 and H264 encoders.</entry> | |||
| 2183 | <entry>integer</entry> | 2183 | <entry>integer</entry> |
| 2184 | </row> | 2184 | </row> |
| 2185 | <row><entry spanname="descr">The Video Buffer Verifier size in kilobytes, it is used as a limitation of frame skip. | 2185 | <row><entry spanname="descr">The Video Buffer Verifier size in kilobytes, it is used as a limitation of frame skip. |
| 2186 | The VBV is defined in the standard as a mean to verify that the produced stream will be succesfully decoded. | 2186 | The VBV is defined in the standard as a mean to verify that the produced stream will be successfully decoded. |
| 2187 | The standard describes it as "Part of a hypothetical decoder that is conceptually connected to the | 2187 | The standard describes it as "Part of a hypothetical decoder that is conceptually connected to the |
| 2188 | output of the encoder. Its purpose is to provide a constraint on the variability of the data rate that an | 2188 | output of the encoder. Its purpose is to provide a constraint on the variability of the data rate that an |
| 2189 | encoder or editing process may produce.". | 2189 | encoder or editing process may produce.". |
| @@ -2196,7 +2196,7 @@ Applicable to the MPEG1, MPEG2, MPEG4 encoders.</entry> | |||
| 2196 | <entry>integer</entry> | 2196 | <entry>integer</entry> |
| 2197 | </row> | 2197 | </row> |
| 2198 | <row><entry spanname="descr">The Coded Picture Buffer size in kilobytes, it is used as a limitation of frame skip. | 2198 | <row><entry spanname="descr">The Coded Picture Buffer size in kilobytes, it is used as a limitation of frame skip. |
| 2199 | The CPB is defined in the H264 standard as a mean to verify that the produced stream will be succesfully decoded. | 2199 | The CPB is defined in the H264 standard as a mean to verify that the produced stream will be successfully decoded. |
| 2200 | Applicable to the H264 encoder.</entry> | 2200 | Applicable to the H264 encoder.</entry> |
| 2201 | </row> | 2201 | </row> |
| 2202 | 2202 | ||
diff --git a/Documentation/blackfin/bfin-gpio-notes.txt b/Documentation/blackfin/bfin-gpio-notes.txt index d36b01f778b9..d245f39c3d01 100644 --- a/Documentation/blackfin/bfin-gpio-notes.txt +++ b/Documentation/blackfin/bfin-gpio-notes.txt | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | 53 | ||
| 54 | 3. But there are some exceptions | 54 | 3. But there are some exceptions |
| 55 | - Kernel permit the identical GPIO be requested both as GPIO and GPIO | 55 | - Kernel permit the identical GPIO be requested both as GPIO and GPIO |
| 56 | interrut. | 56 | interrupt. |
| 57 | Some drivers, like gpio-keys, need this behavior. Kernel only print out | 57 | Some drivers, like gpio-keys, need this behavior. Kernel only print out |
| 58 | warning messages like, | 58 | warning messages like, |
| 59 | bfin-gpio: GPIO 24 is already reserved by gpio-keys: BTN0, and you are | 59 | bfin-gpio: GPIO 24 is already reserved by gpio-keys: BTN0, and you are |
diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt index 1ad80d5865a9..f31b686d4556 100644 --- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt +++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Flexcan CAN contoller on Freescale's ARM and PowerPC system-on-a-chip (SOC). | 1 | Flexcan CAN controller on Freescale's ARM and PowerPC system-on-a-chip (SOC). |
| 2 | 2 | ||
| 3 | Required properties: | 3 | Required properties: |
| 4 | 4 | ||
diff --git a/Documentation/dvb/opera-firmware.txt b/Documentation/dvb/opera-firmware.txt index 93e784c2607b..fb6683188ef7 100644 --- a/Documentation/dvb/opera-firmware.txt +++ b/Documentation/dvb/opera-firmware.txt | |||
| @@ -8,7 +8,7 @@ from the windriver disk into this directory. | |||
| 8 | 8 | ||
| 9 | Then run | 9 | Then run |
| 10 | 10 | ||
| 11 | ./get_dvb_firware opera1 | 11 | ./get_dvb_firmware opera1 |
| 12 | 12 | ||
| 13 | and after that you have 2 files: | 13 | and after that you have 2 files: |
| 14 | 14 | ||
| @@ -24,4 +24,4 @@ After that the driver can load the firmware | |||
| 24 | in kernel config and have hotplug running). | 24 | in kernel config and have hotplug running). |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | Marco Gittler <g.marco@freenet.de> \ No newline at end of file | 27 | Marco Gittler <g.marco@freenet.de> |
diff --git a/Documentation/edac.txt b/Documentation/edac.txt index fdcc49fad8e1..03df2b020332 100644 --- a/Documentation/edac.txt +++ b/Documentation/edac.txt | |||
| @@ -734,7 +734,7 @@ were done at i7core_edac driver. This chapter will cover those differences | |||
| 734 | associated with a physical CPU socket. | 734 | associated with a physical CPU socket. |
| 735 | 735 | ||
| 736 | Each MC have 3 physical read channels, 3 physical write channels and | 736 | Each MC have 3 physical read channels, 3 physical write channels and |
| 737 | 3 logic channels. The driver currenty sees it as just 3 channels. | 737 | 3 logic channels. The driver currently sees it as just 3 channels. |
| 738 | Each channel can have up to 3 DIMMs. | 738 | Each channel can have up to 3 DIMMs. |
| 739 | 739 | ||
| 740 | The minimum known unity is DIMMs. There are no information about csrows. | 740 | The minimum known unity is DIMMs. There are no information about csrows. |
diff --git a/Documentation/filesystems/nfs/pnfs.txt b/Documentation/filesystems/nfs/pnfs.txt index c7919c6e3bea..52ae07f5f578 100644 --- a/Documentation/filesystems/nfs/pnfs.txt +++ b/Documentation/filesystems/nfs/pnfs.txt | |||
| @@ -93,7 +93,7 @@ The API to the login script is as follows: | |||
| 93 | (allways exists) | 93 | (allways exists) |
| 94 | (More protocols can be defined in the future. | 94 | (More protocols can be defined in the future. |
| 95 | The client does not interpret this string it is | 95 | The client does not interpret this string it is |
| 96 | passed unchanged as recieved from the Server) | 96 | passed unchanged as received from the Server) |
| 97 | -o osdname of the requested target OSD | 97 | -o osdname of the requested target OSD |
| 98 | (Might be empty) | 98 | (Might be empty) |
| 99 | (A string which denotes the OSD name, there is a | 99 | (A string which denotes the OSD name, there is a |
diff --git a/Documentation/filesystems/qnx6.txt b/Documentation/filesystems/qnx6.txt index 050223ea03c7..e59f2f09f56e 100644 --- a/Documentation/filesystems/qnx6.txt +++ b/Documentation/filesystems/qnx6.txt | |||
| @@ -17,7 +17,7 @@ concepts of blocks, inodes and directories. | |||
| 17 | On QNX it is possible to create little endian and big endian qnx6 filesystems. | 17 | On QNX it is possible to create little endian and big endian qnx6 filesystems. |
| 18 | This feature makes it possible to create and use a different endianness fs | 18 | This feature makes it possible to create and use a different endianness fs |
| 19 | for the target (QNX is used on quite a range of embedded systems) plattform | 19 | for the target (QNX is used on quite a range of embedded systems) plattform |
| 20 | running on a different endianess. | 20 | running on a different endianness. |
| 21 | The Linux driver handles endianness transparently. (LE and BE) | 21 | The Linux driver handles endianness transparently. (LE and BE) |
| 22 | 22 | ||
| 23 | Blocks | 23 | Blocks |
| @@ -26,7 +26,7 @@ Blocks | |||
| 26 | The space in the device or file is split up into blocks. These are a fixed | 26 | The space in the device or file is split up into blocks. These are a fixed |
| 27 | size of 512, 1024, 2048 or 4096, which is decided when the filesystem is | 27 | size of 512, 1024, 2048 or 4096, which is decided when the filesystem is |
| 28 | created. | 28 | created. |
| 29 | Blockpointers are 32bit, so the maximum space that can be adressed is | 29 | Blockpointers are 32bit, so the maximum space that can be addressed is |
| 30 | 2^32 * 4096 bytes or 16TB | 30 | 2^32 * 4096 bytes or 16TB |
| 31 | 31 | ||
| 32 | The superblocks | 32 | The superblocks |
| @@ -47,16 +47,16 @@ inactive superblock. | |||
| 47 | Each superblock holds a set of root inodes for the different filesystem | 47 | Each superblock holds a set of root inodes for the different filesystem |
| 48 | parts. (Inode, Bitmap and Longfilenames) | 48 | parts. (Inode, Bitmap and Longfilenames) |
| 49 | Each of these root nodes holds information like total size of the stored | 49 | Each of these root nodes holds information like total size of the stored |
| 50 | data and the adressing levels in that specific tree. | 50 | data and the addressing levels in that specific tree. |
| 51 | If the level value is 0, up to 16 direct blocks can be adressed by each | 51 | If the level value is 0, up to 16 direct blocks can be addressed by each |
| 52 | node. | 52 | node. |
| 53 | Level 1 adds an additional indirect adressing level where each indirect | 53 | Level 1 adds an additional indirect addressing level where each indirect |
| 54 | adressing block holds up to blocksize / 4 bytes pointers to data blocks. | 54 | addressing block holds up to blocksize / 4 bytes pointers to data blocks. |
| 55 | Level 2 adds an additional indirect adressig block level (so, already up | 55 | Level 2 adds an additional indirect addressing block level (so, already up |
| 56 | to 16 * 256 * 256 = 1048576 blocks that can be adressed by such a tree)a | 56 | to 16 * 256 * 256 = 1048576 blocks that can be addressed by such a tree). |
| 57 | 57 | ||
| 58 | Unused block pointers are always set to ~0 - regardless of root node, | 58 | Unused block pointers are always set to ~0 - regardless of root node, |
| 59 | indirect adressing blocks or inodes. | 59 | indirect addressing blocks or inodes. |
| 60 | Data leaves are always on the lowest level. So no data is stored on upper | 60 | Data leaves are always on the lowest level. So no data is stored on upper |
| 61 | tree levels. | 61 | tree levels. |
| 62 | 62 | ||
| @@ -64,7 +64,7 @@ The first Superblock is located at 0x2000. (0x2000 is the bootblock size) | |||
| 64 | The Audi MMI 3G first superblock directly starts at byte 0. | 64 | The Audi MMI 3G first superblock directly starts at byte 0. |
| 65 | Second superblock position can either be calculated from the superblock | 65 | Second superblock position can either be calculated from the superblock |
| 66 | information (total number of filesystem blocks) or by taking the highest | 66 | information (total number of filesystem blocks) or by taking the highest |
| 67 | device address, zeroing the last 3 bytes and then substracting 0x1000 from | 67 | device address, zeroing the last 3 bytes and then subtracting 0x1000 from |
| 68 | that address. | 68 | that address. |
| 69 | 69 | ||
| 70 | 0x1000 is the size reserved for each superblock - regardless of the | 70 | 0x1000 is the size reserved for each superblock - regardless of the |
| @@ -83,8 +83,8 @@ size, number of blocks used, access time, change time and modification time. | |||
| 83 | Object mode field is POSIX format. (which makes things easier) | 83 | Object mode field is POSIX format. (which makes things easier) |
| 84 | 84 | ||
| 85 | There are also pointers to the first 16 blocks, if the object data can be | 85 | There are also pointers to the first 16 blocks, if the object data can be |
| 86 | adressed with 16 direct blocks. | 86 | addressed with 16 direct blocks. |
| 87 | For more than 16 blocks an indirect adressing in form of another tree is | 87 | For more than 16 blocks an indirect addressing in form of another tree is |
| 88 | used. (scheme is the same as the one used for the superblock root nodes) | 88 | used. (scheme is the same as the one used for the superblock root nodes) |
| 89 | 89 | ||
| 90 | The filesize is stored 64bit. Inode counting starts with 1. (whilst long | 90 | The filesize is stored 64bit. Inode counting starts with 1. (whilst long |
| @@ -118,13 +118,13 @@ no block pointers and the directory file record pointing to the target file | |||
| 118 | inode. | 118 | inode. |
| 119 | 119 | ||
| 120 | Character and block special devices do not exist in QNX as those files | 120 | Character and block special devices do not exist in QNX as those files |
| 121 | are handled by the QNX kernel/drivers and created in /dev independant of the | 121 | are handled by the QNX kernel/drivers and created in /dev independent of the |
| 122 | underlaying filesystem. | 122 | underlaying filesystem. |
| 123 | 123 | ||
| 124 | Long filenames | 124 | Long filenames |
| 125 | -------------- | 125 | -------------- |
| 126 | 126 | ||
| 127 | Long filenames are stored in a seperate adressing tree. The staring point | 127 | Long filenames are stored in a separate addressing tree. The staring point |
| 128 | is the longfilename root node in the active superblock. | 128 | is the longfilename root node in the active superblock. |
| 129 | Each data block (tree leaves) holds one long filename. That filename is | 129 | Each data block (tree leaves) holds one long filename. That filename is |
| 130 | limited to 510 bytes. The first two starting bytes are used as length field | 130 | limited to 510 bytes. The first two starting bytes are used as length field |
diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87 index 23b7def21ba8..fba745571684 100644 --- a/Documentation/hwmon/it87 +++ b/Documentation/hwmon/it87 | |||
| @@ -63,7 +63,7 @@ Module Parameters | |||
| 63 | Hardware Interfaces | 63 | Hardware Interfaces |
| 64 | ------------------- | 64 | ------------------- |
| 65 | 65 | ||
| 66 | All the chips suported by this driver are LPC Super-I/O chips, accessed | 66 | All the chips supported by this driver are LPC Super-I/O chips, accessed |
| 67 | through the LPC bus (ISA-like I/O ports). The IT8712F additionally has an | 67 | through the LPC bus (ISA-like I/O ports). The IT8712F additionally has an |
| 68 | SMBus interface to the hardware monitoring functions. This driver no | 68 | SMBus interface to the hardware monitoring functions. This driver no |
| 69 | longer supports this interface though, as it is slower and less reliable | 69 | longer supports this interface though, as it is slower and less reliable |
diff --git a/Documentation/hwmon/wm831x b/Documentation/hwmon/wm831x index 24f47d8f6a42..11446757c8c8 100644 --- a/Documentation/hwmon/wm831x +++ b/Documentation/hwmon/wm831x | |||
| @@ -22,7 +22,7 @@ reporting of all the input values but does not provide any alarms. | |||
| 22 | Voltage Monitoring | 22 | Voltage Monitoring |
| 23 | ------------------ | 23 | ------------------ |
| 24 | 24 | ||
| 25 | Voltages are sampled by a 12 bit ADC. Voltages in milivolts are 1.465 | 25 | Voltages are sampled by a 12 bit ADC. Voltages in millivolts are 1.465 |
| 26 | times the ADC value. | 26 | times the ADC value. |
| 27 | 27 | ||
| 28 | Temperature Monitoring | 28 | Temperature Monitoring |
diff --git a/Documentation/memory-hotplug.txt b/Documentation/memory-hotplug.txt index 8f485d72cf25..6d0c2519cf47 100644 --- a/Documentation/memory-hotplug.txt +++ b/Documentation/memory-hotplug.txt | |||
| @@ -341,7 +341,7 @@ Need more implementation yet.... | |||
| 341 | -------------------------------- | 341 | -------------------------------- |
| 342 | 8. Memory hotplug event notifier | 342 | 8. Memory hotplug event notifier |
| 343 | -------------------------------- | 343 | -------------------------------- |
| 344 | Memory hotplug has event notifer. There are 6 types of notification. | 344 | Memory hotplug has event notifier. There are 6 types of notification. |
| 345 | 345 | ||
| 346 | MEMORY_GOING_ONLINE | 346 | MEMORY_GOING_ONLINE |
| 347 | Generated before new memory becomes available in order to be able to | 347 | Generated before new memory becomes available in order to be able to |
diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt index 56ca3b75376e..ac295399f0d4 100644 --- a/Documentation/networking/can.txt +++ b/Documentation/networking/can.txt | |||
| @@ -649,7 +649,7 @@ solution for a couple of reasons: | |||
| 649 | The CAN device must be configured via netlink interface. The supported | 649 | The CAN device must be configured via netlink interface. The supported |
| 650 | netlink message types are defined and briefly described in | 650 | netlink message types are defined and briefly described in |
| 651 | "include/linux/can/netlink.h". CAN link support for the program "ip" | 651 | "include/linux/can/netlink.h". CAN link support for the program "ip" |
| 652 | of the IPROUTE2 utility suite is avaiable and it can be used as shown | 652 | of the IPROUTE2 utility suite is available and it can be used as shown |
| 653 | below: | 653 | below: |
| 654 | 654 | ||
| 655 | - Setting CAN device properties: | 655 | - Setting CAN device properties: |
diff --git a/Documentation/parisc/debugging b/Documentation/parisc/debugging index d728594058e5..7d75223fa18d 100644 --- a/Documentation/parisc/debugging +++ b/Documentation/parisc/debugging | |||
| @@ -34,6 +34,6 @@ registers interruption handlers read to find out where the machine | |||
| 34 | was interrupted - so if you get an interruption between the instruction | 34 | was interrupted - so if you get an interruption between the instruction |
| 35 | that clears the Q bit and the RFI that sets it again you don't know | 35 | that clears the Q bit and the RFI that sets it again you don't know |
| 36 | where exactly it happened. If you're lucky the IAOQ will point to the | 36 | where exactly it happened. If you're lucky the IAOQ will point to the |
| 37 | instrucion that cleared the Q bit, if you're not it points anywhere | 37 | instruction that cleared the Q bit, if you're not it points anywhere |
| 38 | at all. Usually Q bit problems will show themselves in unexplainable | 38 | at all. Usually Q bit problems will show themselves in unexplainable |
| 39 | system hangs or running off the end of physical memory. | 39 | system hangs or running off the end of physical memory. |
diff --git a/Documentation/sound/alsa/compress_offload.txt b/Documentation/sound/alsa/compress_offload.txt index c83a835350f0..90e9b3a11abc 100644 --- a/Documentation/sound/alsa/compress_offload.txt +++ b/Documentation/sound/alsa/compress_offload.txt | |||
| @@ -18,7 +18,7 @@ processing. Support for such hardware has not been very good in Linux, | |||
| 18 | mostly because of a lack of a generic API available in the mainline | 18 | mostly because of a lack of a generic API available in the mainline |
| 19 | kernel. | 19 | kernel. |
| 20 | 20 | ||
| 21 | Rather than requiring a compability break with an API change of the | 21 | Rather than requiring a compatibility break with an API change of the |
| 22 | ALSA PCM interface, a new 'Compressed Data' API is introduced to | 22 | ALSA PCM interface, a new 'Compressed Data' API is introduced to |
| 23 | provide a control and data-streaming interface for audio DSPs. | 23 | provide a control and data-streaming interface for audio DSPs. |
| 24 | 24 | ||
diff --git a/Documentation/sound/oss/ALS b/Documentation/sound/oss/ALS index d01ffbfd5808..bf10bed4574b 100644 --- a/Documentation/sound/oss/ALS +++ b/Documentation/sound/oss/ALS | |||
| @@ -57,10 +57,10 @@ The resulting sound driver will provide the following capabilities: | |||
| 57 | DSP/PCM/audio out (L&R), FM (L&R) and Mic in (mono). | 57 | DSP/PCM/audio out (L&R), FM (L&R) and Mic in (mono). |
| 58 | 58 | ||
| 59 | Jonathan Woithe | 59 | Jonathan Woithe |
| 60 | jwoithe@physics.adelaide.edu.au | 60 | jwoithe@just42.net |
| 61 | 30 March 1998 | 61 | 30 March 1998 |
| 62 | 62 | ||
| 63 | Modified 2000-02-26 by Dave Forrest, drf5n@virginia.edu to add ALS100/ALS200 | 63 | Modified 2000-02-26 by Dave Forrest, drf5n@virginia.edu to add ALS100/ALS200 |
| 64 | Modified 2000-04-10 by Paul Laufer, pelaufer@csupomona.edu to add ISAPnP info. | 64 | Modified 2000-04-10 by Paul Laufer, pelaufer@csupomona.edu to add ISAPnP info. |
| 65 | Modified 2000-11-19 by Jonathan Woithe, jwoithe@physics.adelaide.edu.au | 65 | Modified 2000-11-19 by Jonathan Woithe, jwoithe@just42.net |
| 66 | - updated information for kernel 2.4.x. | 66 | - updated information for kernel 2.4.x. |
diff --git a/Documentation/static-keys.txt b/Documentation/static-keys.txt index d93f3c00f245..9f5263d3152c 100644 --- a/Documentation/static-keys.txt +++ b/Documentation/static-keys.txt | |||
| @@ -235,7 +235,7 @@ label case adds: | |||
| 235 | 6 (mov) + 2 (test) + 2 (jne) = 10 - 5 (5 byte jump 0) = 5 addition bytes. | 235 | 6 (mov) + 2 (test) + 2 (jne) = 10 - 5 (5 byte jump 0) = 5 addition bytes. |
| 236 | 236 | ||
| 237 | If we then include the padding bytes, the jump label code saves, 16 total bytes | 237 | If we then include the padding bytes, the jump label code saves, 16 total bytes |
| 238 | of instruction memory for this small fucntion. In this case the non-jump label | 238 | of instruction memory for this small function. In this case the non-jump label |
| 239 | function is 80 bytes long. Thus, we have have saved 20% of the instruction | 239 | function is 80 bytes long. Thus, we have have saved 20% of the instruction |
| 240 | footprint. We can in fact improve this even further, since the 5-byte no-op | 240 | footprint. We can in fact improve this even further, since the 5-byte no-op |
| 241 | really can be a 2-byte no-op since we can reach the branch with a 2-byte jmp. | 241 | really can be a 2-byte no-op since we can reach the branch with a 2-byte jmp. |
diff --git a/Documentation/usb/dwc3.txt b/Documentation/usb/dwc3.txt index 7b590edae145..1d02c01d1c7c 100644 --- a/Documentation/usb/dwc3.txt +++ b/Documentation/usb/dwc3.txt | |||
| @@ -28,7 +28,7 @@ Please pick something while reading :) | |||
| 28 | none | 28 | none |
| 29 | 29 | ||
| 30 | - primary handler of the EP-interrupt | 30 | - primary handler of the EP-interrupt |
| 31 | reads the event and tries to process it. Everything that requries | 31 | reads the event and tries to process it. Everything that requires |
| 32 | sleeping is handed over to the Thread. The event is saved in an | 32 | sleeping is handed over to the Thread. The event is saved in an |
| 33 | per-endpoint data-structure. | 33 | per-endpoint data-structure. |
| 34 | We probably have to pay attention not to process events once we | 34 | We probably have to pay attention not to process events once we |
diff --git a/Documentation/usb/wusb-cbaf b/Documentation/usb/wusb-cbaf index 426ddaaef96f..8b3d43efce90 100644 --- a/Documentation/usb/wusb-cbaf +++ b/Documentation/usb/wusb-cbaf | |||
| @@ -36,7 +36,7 @@ COMMAND/ARGS are | |||
| 36 | 36 | ||
| 37 | get-cdid DEVICE | 37 | get-cdid DEVICE |
| 38 | 38 | ||
| 39 | Get the device ID associated to the HOST-CHDI we sent with | 39 | Get the device ID associated to the HOST-CHID we sent with |
| 40 | 'set-chid'. We might not know about it. | 40 | 'set-chid'. We might not know about it. |
| 41 | 41 | ||
| 42 | set-cc DEVICE | 42 | set-cc DEVICE |
diff --git a/Documentation/video4linux/README.cpia2 b/Documentation/video4linux/README.cpia2 index ce8213d28b67..38e742fd0df7 100644 --- a/Documentation/video4linux/README.cpia2 +++ b/Documentation/video4linux/README.cpia2 | |||
| @@ -12,7 +12,7 @@ gqcam application to view this stream. | |||
| 12 | The driver is implemented as two kernel modules. The cpia2 module | 12 | The driver is implemented as two kernel modules. The cpia2 module |
| 13 | contains the camera functions and the V4L interface. The cpia2_usb module | 13 | contains the camera functions and the V4L interface. The cpia2_usb module |
| 14 | contains usb specific functions. The main reason for this was the size of the | 14 | contains usb specific functions. The main reason for this was the size of the |
| 15 | module was getting out of hand, so I separted them. It is not likely that | 15 | module was getting out of hand, so I separated them. It is not likely that |
| 16 | there will be a parallel port version. | 16 | there will be a parallel port version. |
| 17 | 17 | ||
| 18 | FEATURES: | 18 | FEATURES: |
diff --git a/MAINTAINERS b/MAINTAINERS index aa067a95ce11..591a10c11257 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2912,7 +2912,7 @@ S: Maintained | |||
| 2912 | F: arch/frv/ | 2912 | F: arch/frv/ |
| 2913 | 2913 | ||
| 2914 | FUJITSU LAPTOP EXTRAS | 2914 | FUJITSU LAPTOP EXTRAS |
| 2915 | M: Jonathan Woithe <jwoithe@physics.adelaide.edu.au> | 2915 | M: Jonathan Woithe <jwoithe@just42.net> |
| 2916 | L: platform-driver-x86@vger.kernel.org | 2916 | L: platform-driver-x86@vger.kernel.org |
| 2917 | S: Maintained | 2917 | S: Maintained |
| 2918 | F: drivers/platform/x86/fujitsu-laptop.c | 2918 | F: drivers/platform/x86/fujitsu-laptop.c |
| @@ -400,8 +400,10 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve | |||
| 400 | 400 | ||
| 401 | # Files to ignore in find ... statements | 401 | # Files to ignore in find ... statements |
| 402 | 402 | ||
| 403 | RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o | 403 | RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ |
| 404 | export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg --exclude .git | 404 | -o -name .pc -o -name .hg -o -name .git \) -prune -o |
| 405 | export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \ | ||
| 406 | --exclude CVS --exclude .pc --exclude .hg --exclude .git | ||
| 405 | 407 | ||
| 406 | # =========================================================================== | 408 | # =========================================================================== |
| 407 | # Rules shared between *config targets and build targets | 409 | # Rules shared between *config targets and build targets |
| @@ -966,7 +968,7 @@ prepare3: include/config/kernel.release | |||
| 966 | ifneq ($(KBUILD_SRC),) | 968 | ifneq ($(KBUILD_SRC),) |
| 967 | @$(kecho) ' Using $(srctree) as source for kernel' | 969 | @$(kecho) ' Using $(srctree) as source for kernel' |
| 968 | $(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \ | 970 | $(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \ |
| 969 | echo " $(srctree) is not clean, please run 'make mrproper'";\ | 971 | echo " $(srctree) is not clean, please run 'make mrproper'"; \ |
| 970 | echo " in the '$(srctree)' directory.";\ | 972 | echo " in the '$(srctree)' directory.";\ |
| 971 | /bin/false; \ | 973 | /bin/false; \ |
| 972 | fi; | 974 | fi; |
| @@ -1003,8 +1005,8 @@ define filechk_utsrelease.h | |||
| 1003 | endef | 1005 | endef |
| 1004 | 1006 | ||
| 1005 | define filechk_version.h | 1007 | define filechk_version.h |
| 1006 | (echo \#define LINUX_VERSION_CODE $(shell \ | 1008 | (echo \#define LINUX_VERSION_CODE $(shell \ |
| 1007 | expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ | 1009 | expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ |
| 1008 | echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) | 1010 | echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) |
| 1009 | endef | 1011 | endef |
| 1010 | 1012 | ||
| @@ -1,4 +1,4 @@ | |||
| 1 | Linux kernel release 3.x <http://kernel.org/> | 1 | Linux kernel release 3.x <http://kernel.org/> |
| 2 | 2 | ||
| 3 | These are the release notes for Linux version 3. Read them carefully, | 3 | These are the release notes for Linux version 3. Read them carefully, |
| 4 | as they tell you what this is all about, explain how to install the | 4 | as they tell you what this is all about, explain how to install the |
| @@ -62,13 +62,13 @@ INSTALLING the kernel source: | |||
| 62 | directory where you have permissions (eg. your home directory) and | 62 | directory where you have permissions (eg. your home directory) and |
| 63 | unpack it: | 63 | unpack it: |
| 64 | 64 | ||
| 65 | gzip -cd linux-3.X.tar.gz | tar xvf - | 65 | gzip -cd linux-3.X.tar.gz | tar xvf - |
| 66 | 66 | ||
| 67 | or | 67 | or |
| 68 | bzip2 -dc linux-3.X.tar.bz2 | tar xvf - | ||
| 69 | 68 | ||
| 69 | bzip2 -dc linux-3.X.tar.bz2 | tar xvf - | ||
| 70 | 70 | ||
| 71 | Replace "XX" with the version number of the latest kernel. | 71 | Replace "X" with the version number of the latest kernel. |
| 72 | 72 | ||
| 73 | Do NOT use the /usr/src/linux area! This area has a (usually | 73 | Do NOT use the /usr/src/linux area! This area has a (usually |
| 74 | incomplete) set of kernel headers that are used by the library header | 74 | incomplete) set of kernel headers that are used by the library header |
| @@ -78,49 +78,43 @@ INSTALLING the kernel source: | |||
| 78 | - You can also upgrade between 3.x releases by patching. Patches are | 78 | - You can also upgrade between 3.x releases by patching. Patches are |
| 79 | distributed in the traditional gzip and the newer bzip2 format. To | 79 | distributed in the traditional gzip and the newer bzip2 format. To |
| 80 | install by patching, get all the newer patch files, enter the | 80 | install by patching, get all the newer patch files, enter the |
| 81 | top level directory of the kernel source (linux-3.x) and execute: | 81 | top level directory of the kernel source (linux-3.X) and execute: |
| 82 | 82 | ||
| 83 | gzip -cd ../patch-3.x.gz | patch -p1 | 83 | gzip -cd ../patch-3.x.gz | patch -p1 |
| 84 | 84 | ||
| 85 | or | 85 | or |
| 86 | bzip2 -dc ../patch-3.x.bz2 | patch -p1 | ||
| 87 | 86 | ||
| 88 | (repeat xx for all versions bigger than the version of your current | 87 | bzip2 -dc ../patch-3.x.bz2 | patch -p1 |
| 89 | source tree, _in_order_) and you should be ok. You may want to remove | 88 | |
| 90 | the backup files (xxx~ or xxx.orig), and make sure that there are no | 89 | Replace "x" for all versions bigger than the version "X" of your current |
| 91 | failed patches (xxx# or xxx.rej). If there are, either you or me has | 90 | source tree, _in_order_, and you should be ok. You may want to remove |
| 92 | made a mistake. | 91 | the backup files (some-file-name~ or some-file-name.orig), and make sure |
| 92 | that there are no failed patches (some-file-name# or some-file-name.rej). | ||
| 93 | If there are, either you or I have made a mistake. | ||
| 93 | 94 | ||
| 94 | Unlike patches for the 3.x kernels, patches for the 3.x.y kernels | 95 | Unlike patches for the 3.x kernels, patches for the 3.x.y kernels |
| 95 | (also known as the -stable kernels) are not incremental but instead apply | 96 | (also known as the -stable kernels) are not incremental but instead apply |
| 96 | directly to the base 3.x kernel. Please read | 97 | directly to the base 3.x kernel. For example, if your base kernel is 3.0 |
| 97 | Documentation/applying-patches.txt for more information. | 98 | and you want to apply the 3.0.3 patch, you must not first apply the 3.0.1 |
| 99 | and 3.0.2 patches. Similarly, if you are running kernel version 3.0.2 and | ||
| 100 | want to jump to 3.0.3, you must first reverse the 3.0.2 patch (that is, | ||
| 101 | patch -R) _before_ applying the 3.0.3 patch. You can read more on this in | ||
| 102 | Documentation/applying-patches.txt | ||
| 98 | 103 | ||
| 99 | Alternatively, the script patch-kernel can be used to automate this | 104 | Alternatively, the script patch-kernel can be used to automate this |
| 100 | process. It determines the current kernel version and applies any | 105 | process. It determines the current kernel version and applies any |
| 101 | patches found. | 106 | patches found. |
| 102 | 107 | ||
| 103 | linux/scripts/patch-kernel linux | 108 | linux/scripts/patch-kernel linux |
| 104 | 109 | ||
| 105 | The first argument in the command above is the location of the | 110 | The first argument in the command above is the location of the |
| 106 | kernel source. Patches are applied from the current directory, but | 111 | kernel source. Patches are applied from the current directory, but |
| 107 | an alternative directory can be specified as the second argument. | 112 | an alternative directory can be specified as the second argument. |
| 108 | 113 | ||
| 109 | - If you are upgrading between releases using the stable series patches | ||
| 110 | (for example, patch-3.x.y), note that these "dot-releases" are | ||
| 111 | not incremental and must be applied to the 3.x base tree. For | ||
| 112 | example, if your base kernel is 3.0 and you want to apply the | ||
| 113 | 3.0.3 patch, you do not and indeed must not first apply the | ||
| 114 | 3.0.1 and 3.0.2 patches. Similarly, if you are running kernel | ||
| 115 | version 3.0.2 and want to jump to 3.0.3, you must first | ||
| 116 | reverse the 3.0.2 patch (that is, patch -R) _before_ applying | ||
| 117 | the 3.0.3 patch. | ||
| 118 | You can read more on this in Documentation/applying-patches.txt | ||
| 119 | |||
| 120 | - Make sure you have no stale .o files and dependencies lying around: | 114 | - Make sure you have no stale .o files and dependencies lying around: |
| 121 | 115 | ||
| 122 | cd linux | 116 | cd linux |
| 123 | make mrproper | 117 | make mrproper |
| 124 | 118 | ||
| 125 | You should now have the sources correctly installed. | 119 | You should now have the sources correctly installed. |
| 126 | 120 | ||
| @@ -137,21 +131,23 @@ SOFTWARE REQUIREMENTS | |||
| 137 | 131 | ||
| 138 | BUILD directory for the kernel: | 132 | BUILD directory for the kernel: |
| 139 | 133 | ||
| 140 | When compiling the kernel all output files will per default be | 134 | When compiling the kernel, all output files will per default be |
| 141 | stored together with the kernel source code. | 135 | stored together with the kernel source code. |
| 142 | Using the option "make O=output/dir" allow you to specify an alternate | 136 | Using the option "make O=output/dir" allow you to specify an alternate |
| 143 | place for the output files (including .config). | 137 | place for the output files (including .config). |
| 144 | Example: | 138 | Example: |
| 145 | kernel source code: /usr/src/linux-3.N | ||
| 146 | build directory: /home/name/build/kernel | ||
| 147 | 139 | ||
| 148 | To configure and build the kernel use: | 140 | kernel source code: /usr/src/linux-3.X |
| 149 | cd /usr/src/linux-3.N | 141 | build directory: /home/name/build/kernel |
| 150 | make O=/home/name/build/kernel menuconfig | 142 | |
| 151 | make O=/home/name/build/kernel | 143 | To configure and build the kernel, use: |
| 152 | sudo make O=/home/name/build/kernel modules_install install | ||
| 153 | 144 | ||
| 154 | Please note: If the 'O=output/dir' option is used then it must be | 145 | cd /usr/src/linux-3.X |
| 146 | make O=/home/name/build/kernel menuconfig | ||
| 147 | make O=/home/name/build/kernel | ||
| 148 | sudo make O=/home/name/build/kernel modules_install install | ||
| 149 | |||
| 150 | Please note: If the 'O=output/dir' option is used, then it must be | ||
| 155 | used for all invocations of make. | 151 | used for all invocations of make. |
| 156 | 152 | ||
| 157 | CONFIGURING the kernel: | 153 | CONFIGURING the kernel: |
| @@ -163,61 +159,78 @@ CONFIGURING the kernel: | |||
| 163 | new version with minimal work, use "make oldconfig", which will | 159 | new version with minimal work, use "make oldconfig", which will |
| 164 | only ask you for the answers to new questions. | 160 | only ask you for the answers to new questions. |
| 165 | 161 | ||
| 166 | - Alternate configuration commands are: | 162 | - Alternative configuration commands are: |
| 167 | "make config" Plain text interface. | 163 | |
| 168 | "make menuconfig" Text based color menus, radiolists & dialogs. | 164 | "make config" Plain text interface. |
| 169 | "make nconfig" Enhanced text based color menus. | 165 | |
| 170 | "make xconfig" X windows (Qt) based configuration tool. | 166 | "make menuconfig" Text based color menus, radiolists & dialogs. |
| 171 | "make gconfig" X windows (Gtk) based configuration tool. | 167 | |
| 172 | "make oldconfig" Default all questions based on the contents of | 168 | "make nconfig" Enhanced text based color menus. |
| 173 | your existing ./.config file and asking about | 169 | |
| 174 | new config symbols. | 170 | "make xconfig" X windows (Qt) based configuration tool. |
| 175 | "make silentoldconfig" | 171 | |
| 176 | Like above, but avoids cluttering the screen | 172 | "make gconfig" X windows (Gtk) based configuration tool. |
| 177 | with questions already answered. | 173 | |
| 178 | Additionally updates the dependencies. | 174 | "make oldconfig" Default all questions based on the contents of |
| 179 | "make defconfig" Create a ./.config file by using the default | 175 | your existing ./.config file and asking about |
| 180 | symbol values from either arch/$ARCH/defconfig | 176 | new config symbols. |
| 181 | or arch/$ARCH/configs/${PLATFORM}_defconfig, | 177 | |
| 182 | depending on the architecture. | 178 | "make silentoldconfig" |
| 183 | "make ${PLATFORM}_defconfig" | 179 | Like above, but avoids cluttering the screen |
| 184 | Create a ./.config file by using the default | 180 | with questions already answered. |
| 185 | symbol values from | 181 | Additionally updates the dependencies. |
| 186 | arch/$ARCH/configs/${PLATFORM}_defconfig. | 182 | |
| 187 | Use "make help" to get a list of all available | 183 | "make defconfig" Create a ./.config file by using the default |
| 188 | platforms of your architecture. | 184 | symbol values from either arch/$ARCH/defconfig |
| 189 | "make allyesconfig" | 185 | or arch/$ARCH/configs/${PLATFORM}_defconfig, |
| 190 | Create a ./.config file by setting symbol | 186 | depending on the architecture. |
| 191 | values to 'y' as much as possible. | 187 | |
| 192 | "make allmodconfig" | 188 | "make ${PLATFORM}_defconfig" |
| 193 | Create a ./.config file by setting symbol | 189 | Create a ./.config file by using the default |
| 194 | values to 'm' as much as possible. | 190 | symbol values from |
| 195 | "make allnoconfig" Create a ./.config file by setting symbol | 191 | arch/$ARCH/configs/${PLATFORM}_defconfig. |
| 196 | values to 'n' as much as possible. | 192 | Use "make help" to get a list of all available |
| 197 | "make randconfig" Create a ./.config file by setting symbol | 193 | platforms of your architecture. |
| 198 | values to random values. | 194 | |
| 195 | "make allyesconfig" | ||
| 196 | Create a ./.config file by setting symbol | ||
| 197 | values to 'y' as much as possible. | ||
| 198 | |||
| 199 | "make allmodconfig" | ||
| 200 | Create a ./.config file by setting symbol | ||
| 201 | values to 'm' as much as possible. | ||
| 202 | |||
| 203 | "make allnoconfig" Create a ./.config file by setting symbol | ||
| 204 | values to 'n' as much as possible. | ||
| 205 | |||
| 206 | "make randconfig" Create a ./.config file by setting symbol | ||
| 207 | values to random values. | ||
| 199 | 208 | ||
| 200 | You can find more information on using the Linux kernel config tools | 209 | You can find more information on using the Linux kernel config tools |
| 201 | in Documentation/kbuild/kconfig.txt. | 210 | in Documentation/kbuild/kconfig.txt. |
| 202 | 211 | ||
| 203 | NOTES on "make config": | 212 | - NOTES on "make config": |
| 204 | - having unnecessary drivers will make the kernel bigger, and can | 213 | |
| 205 | under some circumstances lead to problems: probing for a | 214 | - Having unnecessary drivers will make the kernel bigger, and can |
| 206 | nonexistent controller card may confuse your other controllers | 215 | under some circumstances lead to problems: probing for a |
| 207 | - compiling the kernel with "Processor type" set higher than 386 | 216 | nonexistent controller card may confuse your other controllers |
| 208 | will result in a kernel that does NOT work on a 386. The | 217 | |
| 209 | kernel will detect this on bootup, and give up. | 218 | - Compiling the kernel with "Processor type" set higher than 386 |
| 210 | - A kernel with math-emulation compiled in will still use the | 219 | will result in a kernel that does NOT work on a 386. The |
| 211 | coprocessor if one is present: the math emulation will just | 220 | kernel will detect this on bootup, and give up. |
| 212 | never get used in that case. The kernel will be slightly larger, | 221 | |
| 213 | but will work on different machines regardless of whether they | 222 | - A kernel with math-emulation compiled in will still use the |
| 214 | have a math coprocessor or not. | 223 | coprocessor if one is present: the math emulation will just |
| 215 | - the "kernel hacking" configuration details usually result in a | 224 | never get used in that case. The kernel will be slightly larger, |
| 216 | bigger or slower kernel (or both), and can even make the kernel | 225 | but will work on different machines regardless of whether they |
| 217 | less stable by configuring some routines to actively try to | 226 | have a math coprocessor or not. |
| 218 | break bad code to find kernel problems (kmalloc()). Thus you | 227 | |
| 219 | should probably answer 'n' to the questions for | 228 | - The "kernel hacking" configuration details usually result in a |
| 220 | "development", "experimental", or "debugging" features. | 229 | bigger or slower kernel (or both), and can even make the kernel |
| 230 | less stable by configuring some routines to actively try to | ||
| 231 | break bad code to find kernel problems (kmalloc()). Thus you | ||
| 232 | should probably answer 'n' to the questions for "development", | ||
| 233 | "experimental", or "debugging" features. | ||
| 221 | 234 | ||
| 222 | COMPILING the kernel: | 235 | COMPILING the kernel: |
| 223 | 236 | ||
| @@ -230,7 +243,7 @@ COMPILING the kernel: | |||
| 230 | possible to do "make install" if you have lilo installed to suit the | 243 | possible to do "make install" if you have lilo installed to suit the |
| 231 | kernel makefiles, but you may want to check your particular lilo setup first. | 244 | kernel makefiles, but you may want to check your particular lilo setup first. |
| 232 | 245 | ||
| 233 | To do the actual install you have to be root, but none of the normal | 246 | To do the actual install, you have to be root, but none of the normal |
| 234 | build should require that. Don't take the name of root in vain. | 247 | build should require that. Don't take the name of root in vain. |
| 235 | 248 | ||
| 236 | - If you configured any of the parts of the kernel as `modules', you | 249 | - If you configured any of the parts of the kernel as `modules', you |
| @@ -238,13 +251,13 @@ COMPILING the kernel: | |||
| 238 | 251 | ||
| 239 | - Verbose kernel compile/build output: | 252 | - Verbose kernel compile/build output: |
| 240 | 253 | ||
| 241 | Normally the kernel build system runs in a fairly quiet mode (but not | 254 | Normally, the kernel build system runs in a fairly quiet mode (but not |
| 242 | totally silent). However, sometimes you or other kernel developers need | 255 | totally silent). However, sometimes you or other kernel developers need |
| 243 | to see compile, link, or other commands exactly as they are executed. | 256 | to see compile, link, or other commands exactly as they are executed. |
| 244 | For this, use "verbose" build mode. This is done by inserting | 257 | For this, use "verbose" build mode. This is done by inserting |
| 245 | "V=1" in the "make" command. E.g.: | 258 | "V=1" in the "make" command. E.g.: |
| 246 | 259 | ||
| 247 | make V=1 all | 260 | make V=1 all |
| 248 | 261 | ||
| 249 | To have the build system also tell the reason for the rebuild of each | 262 | To have the build system also tell the reason for the rebuild of each |
| 250 | target, use "V=2". The default is "V=0". | 263 | target, use "V=2". The default is "V=0". |
| @@ -256,6 +269,7 @@ COMPILING the kernel: | |||
| 256 | are installing a new kernel with the same version number as your | 269 | are installing a new kernel with the same version number as your |
| 257 | working kernel, make a backup of your modules directory before you | 270 | working kernel, make a backup of your modules directory before you |
| 258 | do a "make modules_install". | 271 | do a "make modules_install". |
| 272 | |||
| 259 | Alternatively, before compiling, use the kernel config option | 273 | Alternatively, before compiling, use the kernel config option |
| 260 | "LOCALVERSION" to append a unique suffix to the regular kernel version. | 274 | "LOCALVERSION" to append a unique suffix to the regular kernel version. |
| 261 | LOCALVERSION can be set in the "General Setup" menu. | 275 | LOCALVERSION can be set in the "General Setup" menu. |
| @@ -267,7 +281,7 @@ COMPILING the kernel: | |||
| 267 | - Booting a kernel directly from a floppy without the assistance of a | 281 | - Booting a kernel directly from a floppy without the assistance of a |
| 268 | bootloader such as LILO, is no longer supported. | 282 | bootloader such as LILO, is no longer supported. |
| 269 | 283 | ||
| 270 | If you boot Linux from the hard drive, chances are you use LILO which | 284 | If you boot Linux from the hard drive, chances are you use LILO, which |
| 271 | uses the kernel image as specified in the file /etc/lilo.conf. The | 285 | uses the kernel image as specified in the file /etc/lilo.conf. The |
| 272 | kernel image file is usually /vmlinuz, /boot/vmlinuz, /bzImage or | 286 | kernel image file is usually /vmlinuz, /boot/vmlinuz, /bzImage or |
| 273 | /boot/bzImage. To use the new kernel, save a copy of the old image | 287 | /boot/bzImage. To use the new kernel, save a copy of the old image |
| @@ -306,21 +320,21 @@ IF SOMETHING GOES WRONG: | |||
| 306 | 320 | ||
| 307 | - If the bug results in a message like | 321 | - If the bug results in a message like |
| 308 | 322 | ||
| 309 | unable to handle kernel paging request at address C0000010 | 323 | unable to handle kernel paging request at address C0000010 |
| 310 | Oops: 0002 | 324 | Oops: 0002 |
| 311 | EIP: 0010:XXXXXXXX | 325 | EIP: 0010:XXXXXXXX |
| 312 | eax: xxxxxxxx ebx: xxxxxxxx ecx: xxxxxxxx edx: xxxxxxxx | 326 | eax: xxxxxxxx ebx: xxxxxxxx ecx: xxxxxxxx edx: xxxxxxxx |
| 313 | esi: xxxxxxxx edi: xxxxxxxx ebp: xxxxxxxx | 327 | esi: xxxxxxxx edi: xxxxxxxx ebp: xxxxxxxx |
| 314 | ds: xxxx es: xxxx fs: xxxx gs: xxxx | 328 | ds: xxxx es: xxxx fs: xxxx gs: xxxx |
| 315 | Pid: xx, process nr: xx | 329 | Pid: xx, process nr: xx |
| 316 | xx xx xx xx xx xx xx xx xx xx | 330 | xx xx xx xx xx xx xx xx xx xx |
| 317 | 331 | ||
| 318 | or similar kernel debugging information on your screen or in your | 332 | or similar kernel debugging information on your screen or in your |
| 319 | system log, please duplicate it *exactly*. The dump may look | 333 | system log, please duplicate it *exactly*. The dump may look |
| 320 | incomprehensible to you, but it does contain information that may | 334 | incomprehensible to you, but it does contain information that may |
| 321 | help debugging the problem. The text above the dump is also | 335 | help debugging the problem. The text above the dump is also |
| 322 | important: it tells something about why the kernel dumped code (in | 336 | important: it tells something about why the kernel dumped code (in |
| 323 | the above example it's due to a bad kernel pointer). More information | 337 | the above example, it's due to a bad kernel pointer). More information |
| 324 | on making sense of the dump is in Documentation/oops-tracing.txt | 338 | on making sense of the dump is in Documentation/oops-tracing.txt |
| 325 | 339 | ||
| 326 | - If you compiled the kernel with CONFIG_KALLSYMS you can send the dump | 340 | - If you compiled the kernel with CONFIG_KALLSYMS you can send the dump |
| @@ -328,7 +342,7 @@ IF SOMETHING GOES WRONG: | |||
| 328 | sense of the dump (but compiling with CONFIG_KALLSYMS is usually preferred). | 342 | sense of the dump (but compiling with CONFIG_KALLSYMS is usually preferred). |
| 329 | This utility can be downloaded from | 343 | This utility can be downloaded from |
| 330 | ftp://ftp.<country>.kernel.org/pub/linux/utils/kernel/ksymoops/ . | 344 | ftp://ftp.<country>.kernel.org/pub/linux/utils/kernel/ksymoops/ . |
| 331 | Alternately you can do the dump lookup by hand: | 345 | Alternatively, you can do the dump lookup by hand: |
| 332 | 346 | ||
| 333 | - In debugging dumps like the above, it helps enormously if you can | 347 | - In debugging dumps like the above, it helps enormously if you can |
| 334 | look up what the EIP value means. The hex value as such doesn't help | 348 | look up what the EIP value means. The hex value as such doesn't help |
| @@ -342,7 +356,7 @@ IF SOMETHING GOES WRONG: | |||
| 342 | the file 'linux/vmlinux'. To extract the namelist and match it against | 356 | the file 'linux/vmlinux'. To extract the namelist and match it against |
| 343 | the EIP from the kernel crash, do: | 357 | the EIP from the kernel crash, do: |
| 344 | 358 | ||
| 345 | nm vmlinux | sort | less | 359 | nm vmlinux | sort | less |
| 346 | 360 | ||
| 347 | This will give you a list of kernel addresses sorted in ascending | 361 | This will give you a list of kernel addresses sorted in ascending |
| 348 | order, from which it is simple to find the function that contains the | 362 | order, from which it is simple to find the function that contains the |
| @@ -361,7 +375,7 @@ IF SOMETHING GOES WRONG: | |||
| 361 | kernel image or similar), telling me as much about your setup as | 375 | kernel image or similar), telling me as much about your setup as |
| 362 | possible will help. Please read the REPORTING-BUGS document for details. | 376 | possible will help. Please read the REPORTING-BUGS document for details. |
| 363 | 377 | ||
| 364 | - Alternately, you can use gdb on a running kernel. (read-only; i.e. you | 378 | - Alternatively, you can use gdb on a running kernel. (read-only; i.e. you |
| 365 | cannot change values or set break points.) To do this, first compile the | 379 | cannot change values or set break points.) To do this, first compile the |
| 366 | kernel with -g; edit arch/i386/Makefile appropriately, then do a "make | 380 | kernel with -g; edit arch/i386/Makefile appropriately, then do a "make |
| 367 | clean". You'll also need to enable CONFIG_PROC_FS (via "make config"). | 381 | clean". You'll also need to enable CONFIG_PROC_FS (via "make config"). |
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index cd634795aa9c..3f844d26d2c7 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c | |||
| @@ -236,7 +236,7 @@ static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask) | |||
| 236 | ok = 0; | 236 | ok = 0; |
| 237 | 237 | ||
| 238 | /* If both conditions above are met, we are fine. */ | 238 | /* If both conditions above are met, we are fine. */ |
| 239 | DBGA("pci_dac_dma_supported %s from %p\n", | 239 | DBGA("pci_dac_dma_supported %s from %pf\n", |
| 240 | ok ? "yes" : "no", __builtin_return_address(0)); | 240 | ok ? "yes" : "no", __builtin_return_address(0)); |
| 241 | 241 | ||
| 242 | return ok; | 242 | return ok; |
| @@ -268,7 +268,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, | |||
| 268 | && paddr + size <= __direct_map_size) { | 268 | && paddr + size <= __direct_map_size) { |
| 269 | ret = paddr + __direct_map_base; | 269 | ret = paddr + __direct_map_base; |
| 270 | 270 | ||
| 271 | DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %p\n", | 271 | DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %pf\n", |
| 272 | cpu_addr, size, ret, __builtin_return_address(0)); | 272 | cpu_addr, size, ret, __builtin_return_address(0)); |
| 273 | 273 | ||
| 274 | return ret; | 274 | return ret; |
| @@ -279,7 +279,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, | |||
| 279 | if (dac_allowed) { | 279 | if (dac_allowed) { |
| 280 | ret = paddr + alpha_mv.pci_dac_offset; | 280 | ret = paddr + alpha_mv.pci_dac_offset; |
| 281 | 281 | ||
| 282 | DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %p\n", | 282 | DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %pf\n", |
| 283 | cpu_addr, size, ret, __builtin_return_address(0)); | 283 | cpu_addr, size, ret, __builtin_return_address(0)); |
| 284 | 284 | ||
| 285 | return ret; | 285 | return ret; |
| @@ -316,7 +316,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, | |||
| 316 | ret = arena->dma_base + dma_ofs * PAGE_SIZE; | 316 | ret = arena->dma_base + dma_ofs * PAGE_SIZE; |
| 317 | ret += (unsigned long)cpu_addr & ~PAGE_MASK; | 317 | ret += (unsigned long)cpu_addr & ~PAGE_MASK; |
| 318 | 318 | ||
| 319 | DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %p\n", | 319 | DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %pf\n", |
| 320 | cpu_addr, size, npages, ret, __builtin_return_address(0)); | 320 | cpu_addr, size, npages, ret, __builtin_return_address(0)); |
| 321 | 321 | ||
| 322 | return ret; | 322 | return ret; |
| @@ -385,14 +385,14 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, | |||
| 385 | && dma_addr < __direct_map_base + __direct_map_size) { | 385 | && dma_addr < __direct_map_base + __direct_map_size) { |
| 386 | /* Nothing to do. */ | 386 | /* Nothing to do. */ |
| 387 | 387 | ||
| 388 | DBGA2("pci_unmap_single: direct [%llx,%zx] from %p\n", | 388 | DBGA2("pci_unmap_single: direct [%llx,%zx] from %pf\n", |
| 389 | dma_addr, size, __builtin_return_address(0)); | 389 | dma_addr, size, __builtin_return_address(0)); |
| 390 | 390 | ||
| 391 | return; | 391 | return; |
| 392 | } | 392 | } |
| 393 | 393 | ||
| 394 | if (dma_addr > 0xffffffff) { | 394 | if (dma_addr > 0xffffffff) { |
| 395 | DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %p\n", | 395 | DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %pf\n", |
| 396 | dma_addr, size, __builtin_return_address(0)); | 396 | dma_addr, size, __builtin_return_address(0)); |
| 397 | return; | 397 | return; |
| 398 | } | 398 | } |
| @@ -424,7 +424,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, | |||
| 424 | 424 | ||
| 425 | spin_unlock_irqrestore(&arena->lock, flags); | 425 | spin_unlock_irqrestore(&arena->lock, flags); |
| 426 | 426 | ||
| 427 | DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %p\n", | 427 | DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %pf\n", |
| 428 | dma_addr, size, npages, __builtin_return_address(0)); | 428 | dma_addr, size, npages, __builtin_return_address(0)); |
| 429 | } | 429 | } |
| 430 | 430 | ||
| @@ -447,7 +447,7 @@ try_again: | |||
| 447 | cpu_addr = (void *)__get_free_pages(gfp, order); | 447 | cpu_addr = (void *)__get_free_pages(gfp, order); |
| 448 | if (! cpu_addr) { | 448 | if (! cpu_addr) { |
| 449 | printk(KERN_INFO "pci_alloc_consistent: " | 449 | printk(KERN_INFO "pci_alloc_consistent: " |
| 450 | "get_free_pages failed from %p\n", | 450 | "get_free_pages failed from %pf\n", |
| 451 | __builtin_return_address(0)); | 451 | __builtin_return_address(0)); |
| 452 | /* ??? Really atomic allocation? Otherwise we could play | 452 | /* ??? Really atomic allocation? Otherwise we could play |
| 453 | with vmalloc and sg if we can't find contiguous memory. */ | 453 | with vmalloc and sg if we can't find contiguous memory. */ |
| @@ -466,7 +466,7 @@ try_again: | |||
| 466 | goto try_again; | 466 | goto try_again; |
| 467 | } | 467 | } |
| 468 | 468 | ||
| 469 | DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %p\n", | 469 | DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %pf\n", |
| 470 | size, cpu_addr, *dma_addrp, __builtin_return_address(0)); | 470 | size, cpu_addr, *dma_addrp, __builtin_return_address(0)); |
| 471 | 471 | ||
| 472 | return cpu_addr; | 472 | return cpu_addr; |
| @@ -486,7 +486,7 @@ static void alpha_pci_free_coherent(struct device *dev, size_t size, | |||
| 486 | pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL); | 486 | pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL); |
| 487 | free_pages((unsigned long)cpu_addr, get_order(size)); | 487 | free_pages((unsigned long)cpu_addr, get_order(size)); |
| 488 | 488 | ||
| 489 | DBGA2("pci_free_consistent: [%llx,%zx] from %p\n", | 489 | DBGA2("pci_free_consistent: [%llx,%zx] from %pf\n", |
| 490 | dma_addr, size, __builtin_return_address(0)); | 490 | dma_addr, size, __builtin_return_address(0)); |
| 491 | } | 491 | } |
| 492 | 492 | ||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0a2fc01891a9..76edcfe8b56f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1914,10 +1914,10 @@ choice | |||
| 1914 | default ZBOOT_ROM_NONE | 1914 | default ZBOOT_ROM_NONE |
| 1915 | help | 1915 | help |
| 1916 | Include experimental SD/MMC loading code in the ROM-able zImage. | 1916 | Include experimental SD/MMC loading code in the ROM-able zImage. |
| 1917 | With this enabled it is possible to write the the ROM-able zImage | 1917 | With this enabled it is possible to write the ROM-able zImage |
| 1918 | kernel image to an MMC or SD card and boot the kernel straight | 1918 | kernel image to an MMC or SD card and boot the kernel straight |
| 1919 | from the reset vector. At reset the processor Mask ROM will load | 1919 | from the reset vector. At reset the processor Mask ROM will load |
| 1920 | the first part of the the ROM-able zImage which in turn loads the | 1920 | the first part of the ROM-able zImage which in turn loads the |
| 1921 | rest the kernel image to RAM. | 1921 | rest the kernel image to RAM. |
| 1922 | 1922 | ||
| 1923 | config ZBOOT_ROM_NONE | 1923 | config ZBOOT_ROM_NONE |
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 82c0915729ee..06ca1cd4cae2 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig | |||
| @@ -210,7 +210,7 @@ config SMDK6410_WM1190_EV1 | |||
| 210 | and audio daughtercard for the Samsung SMDK6410 reference | 210 | and audio daughtercard for the Samsung SMDK6410 reference |
| 211 | platform. Enabling this option will build support for this | 211 | platform. Enabling this option will build support for this |
| 212 | module into the kernel. The presence of the module will be | 212 | module into the kernel. The presence of the module will be |
| 213 | detected at runtime so the the resulting kernel can be used | 213 | detected at runtime so the resulting kernel can be used |
| 214 | with or without the 1190-EV1 fitted. | 214 | with or without the 1190-EV1 fitted. |
| 215 | 215 | ||
| 216 | config SMDK6410_WM1192_EV1 | 216 | config SMDK6410_WM1192_EV1 |
| @@ -226,7 +226,7 @@ config SMDK6410_WM1192_EV1 | |||
| 226 | daughtercard for the Samsung SMDK6410 reference platform. | 226 | daughtercard for the Samsung SMDK6410 reference platform. |
| 227 | Enabling this option will build support for this module into | 227 | Enabling this option will build support for this module into |
| 228 | the kernel. The presence of the daughtercard will be | 228 | the kernel. The presence of the daughtercard will be |
| 229 | detected at runtime so the the resulting kernel can be used | 229 | detected at runtime so the resulting kernel can be used |
| 230 | with or without the 1192-EV1 fitted. | 230 | with or without the 1192-EV1 fitted. |
| 231 | 231 | ||
| 232 | config MACH_NCP | 232 | config MACH_NCP |
diff --git a/arch/arm/nwfpe/fpmodule.c b/arch/arm/nwfpe/fpmodule.c index cb7658e8acc5..4e729f055a81 100644 --- a/arch/arm/nwfpe/fpmodule.c +++ b/arch/arm/nwfpe/fpmodule.c | |||
| @@ -147,7 +147,7 @@ void float_raise(signed char flags) | |||
| 147 | #ifdef CONFIG_DEBUG_USER | 147 | #ifdef CONFIG_DEBUG_USER |
| 148 | if (flags & debug) | 148 | if (flags & debug) |
| 149 | printk(KERN_DEBUG | 149 | printk(KERN_DEBUG |
| 150 | "NWFPE: %s[%d] takes exception %08x at %p from %08lx\n", | 150 | "NWFPE: %s[%d] takes exception %08x at %pf from %08lx\n", |
| 151 | current->comm, current->pid, flags, | 151 | current->comm, current->pid, flags, |
| 152 | __builtin_return_address(0), GET_USERREG()->ARM_pc); | 152 | __builtin_return_address(0), GET_USERREG()->ARM_pc); |
| 153 | #endif | 153 | #endif |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 7f3c589cc024..79cfe2614bcc 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -1309,7 +1309,7 @@ config PM_BFIN_WAKE_GP | |||
| 1309 | (all processors, except ADSP-BF549). This option sets | 1309 | (all processors, except ADSP-BF549). This option sets |
| 1310 | the general-purpose wake-up enable (GPWE) control bit to enable | 1310 | the general-purpose wake-up enable (GPWE) control bit to enable |
| 1311 | wake-up upon detection of an active low signal on the /GPW (PH7) pin. | 1311 | wake-up upon detection of an active low signal on the /GPW (PH7) pin. |
| 1312 | On ADSP-BF549 this option enables the the same functionality on the | 1312 | On ADSP-BF549 this option enables the same functionality on the |
| 1313 | /MRXON pin also PH7. | 1313 | /MRXON pin also PH7. |
| 1314 | 1314 | ||
| 1315 | config PM_BFIN_WAKE_PA15 | 1315 | config PM_BFIN_WAKE_PA15 |
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index 8a9c767125a4..51b3274cbe71 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu | |||
| @@ -7,7 +7,7 @@ choice | |||
| 7 | help | 7 | help |
| 8 | The Freescale (was Motorola) M68K family of processors implements | 8 | The Freescale (was Motorola) M68K family of processors implements |
| 9 | the full 68000 processor instruction set. | 9 | the full 68000 processor instruction set. |
| 10 | The Freescale ColdFire family of processors is a modern derivitive | 10 | The Freescale ColdFire family of processors is a modern derivative |
| 11 | of the 68000 processor family. They are mainly targeted at embedded | 11 | of the 68000 processor family. They are mainly targeted at embedded |
| 12 | applications, and are all System-On-Chip (SOC) devices, as opposed | 12 | applications, and are all System-On-Chip (SOC) devices, as opposed |
| 13 | to stand alone CPUs. They implement a subset of the original 68000 | 13 | to stand alone CPUs. They implement a subset of the original 68000 |
diff --git a/arch/m68k/platform/coldfire/m532x.c b/arch/m68k/platform/coldfire/m532x.c index 8e9476d59a65..5394223639f8 100644 --- a/arch/m68k/platform/coldfire/m532x.c +++ b/arch/m68k/platform/coldfire/m532x.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Copyright (C) 2000, Lineo (www.lineo.com) | 7 | * Copyright (C) 2000, Lineo (www.lineo.com) |
| 8 | * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com | 8 | * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com |
| 9 | * Copyright Freescale Semiconductor, Inc 2006 | 9 | * Copyright Freescale Semiconductor, Inc 2006 |
| 10 | * Copyright (c) 2006, emlix, Sebastian Hess <sh@emlix.com> | 10 | * Copyright (c) 2006, emlix, Sebastian Hess <shess@hessware.de> |
| 11 | * | 11 | * |
| 12 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
| 13 | * it under the terms of the GNU General Public License as published by | 13 | * it under the terms of the GNU General Public License as published by |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 186fc8cf9ee0..f5e121213c22 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -1002,12 +1002,12 @@ config HOLES_IN_ZONE | |||
| 1002 | bool | 1002 | bool |
| 1003 | 1003 | ||
| 1004 | # | 1004 | # |
| 1005 | # Endianess selection. Sufficiently obscure so many users don't know what to | 1005 | # Endianness selection. Sufficiently obscure so many users don't know what to |
| 1006 | # answer,so we try hard to limit the available choices. Also the use of a | 1006 | # answer,so we try hard to limit the available choices. Also the use of a |
| 1007 | # choice statement should be more obvious to the user. | 1007 | # choice statement should be more obvious to the user. |
| 1008 | # | 1008 | # |
| 1009 | choice | 1009 | choice |
| 1010 | prompt "Endianess selection" | 1010 | prompt "Endianness selection" |
| 1011 | help | 1011 | help |
| 1012 | Some MIPS machines can be configured for either little or big endian | 1012 | Some MIPS machines can be configured for either little or big endian |
| 1013 | byte order. These modes require different kernels and a different | 1013 | byte order. These modes require different kernels and a different |
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index 83ed00a5644a..5a43aa0798ca 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug | |||
| @@ -57,7 +57,7 @@ config CMDLINE | |||
| 57 | options. | 57 | options. |
| 58 | 58 | ||
| 59 | config CMDLINE_OVERRIDE | 59 | config CMDLINE_OVERRIDE |
| 60 | bool "Built-in command line overrides firware arguments" | 60 | bool "Built-in command line overrides firmware arguments" |
| 61 | default n | 61 | default n |
| 62 | depends on CMDLINE_BOOL | 62 | depends on CMDLINE_BOOL |
| 63 | help | 63 | help |
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c index 7f3376b1c219..6ded9bd1489c 100644 --- a/arch/mips/kernel/mips-mt.c +++ b/arch/mips/kernel/mips-mt.c | |||
| @@ -209,7 +209,7 @@ void mips_mt_set_cpuoptions(void) | |||
| 209 | unsigned int nconfig7 = oconfig7; | 209 | unsigned int nconfig7 = oconfig7; |
| 210 | 210 | ||
| 211 | if (mt_opt_norps) { | 211 | if (mt_opt_norps) { |
| 212 | printk("\"norps\" option deprectated: use \"rpsctl=\"\n"); | 212 | printk("\"norps\" option deprecated: use \"rpsctl=\"\n"); |
| 213 | } | 213 | } |
| 214 | if (mt_opt_rpsctl >= 0) { | 214 | if (mt_opt_rpsctl >= 0) { |
| 215 | printk("34K return prediction stack override set to %d.\n", | 215 | printk("34K return prediction stack override set to %d.\n", |
diff --git a/arch/mips/lantiq/xway/gpio.c b/arch/mips/lantiq/xway/gpio.c index d2fa98f3c78d..c429a5bc080f 100644 --- a/arch/mips/lantiq/xway/gpio.c +++ b/arch/mips/lantiq/xway/gpio.c | |||
| @@ -188,7 +188,7 @@ int __init ltq_gpio_init(void) | |||
| 188 | int ret = platform_driver_register(<q_gpio_driver); | 188 | int ret = platform_driver_register(<q_gpio_driver); |
| 189 | 189 | ||
| 190 | if (ret) | 190 | if (ret) |
| 191 | pr_info("ltq_gpio : Error registering platfom driver!"); | 191 | pr_info("ltq_gpio : Error registering platform driver!"); |
| 192 | return ret; | 192 | return ret; |
| 193 | } | 193 | } |
| 194 | 194 | ||
diff --git a/arch/mips/lantiq/xway/gpio_ebu.c b/arch/mips/lantiq/xway/gpio_ebu.c index b91c7f17f10f..aae17170472f 100644 --- a/arch/mips/lantiq/xway/gpio_ebu.c +++ b/arch/mips/lantiq/xway/gpio_ebu.c | |||
| @@ -119,7 +119,7 @@ static int __init ltq_ebu_init(void) | |||
| 119 | int ret = platform_driver_register(<q_ebu_driver); | 119 | int ret = platform_driver_register(<q_ebu_driver); |
| 120 | 120 | ||
| 121 | if (ret) | 121 | if (ret) |
| 122 | pr_info("ltq_ebu : Error registering platfom driver!"); | 122 | pr_info("ltq_ebu : Error registering platform driver!"); |
| 123 | return ret; | 123 | return ret; |
| 124 | } | 124 | } |
| 125 | 125 | ||
diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c index ff9991cddeaa..fd07d87adaa9 100644 --- a/arch/mips/lantiq/xway/gpio_stp.c +++ b/arch/mips/lantiq/xway/gpio_stp.c | |||
| @@ -150,7 +150,7 @@ int __init ltq_stp_init(void) | |||
| 150 | int ret = platform_driver_register(<q_stp_driver); | 150 | int ret = platform_driver_register(<q_stp_driver); |
| 151 | 151 | ||
| 152 | if (ret) | 152 | if (ret) |
| 153 | pr_info("ltq_stp: error registering platfom driver"); | 153 | pr_info("ltq_stp: error registering platform driver"); |
| 154 | return ret; | 154 | return ret; |
| 155 | } | 155 | } |
| 156 | 156 | ||
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index ed3b3d317358..cdb1417fba59 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c | |||
| @@ -29,7 +29,7 @@ static void __init sni_pcimt_sc_init(void) | |||
| 29 | 29 | ||
| 30 | scsiz = cacheconf & 7; | 30 | scsiz = cacheconf & 7; |
| 31 | if (scsiz == 0) { | 31 | if (scsiz == 0) { |
| 32 | printk("Second level cache is deactived.\n"); | 32 | printk("Second level cache is deactivated.\n"); |
| 33 | return; | 33 | return; |
| 34 | } | 34 | } |
| 35 | if (scsiz >= 6) { | 35 | if (scsiz >= 6) { |
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 7589051e79e0..297bd38f7c5d 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig | |||
| @@ -142,7 +142,7 @@ config DEBUG_STACKOVERFLOW | |||
| 142 | bool "Check for kernel stack overflow" | 142 | bool "Check for kernel stack overflow" |
| 143 | default y | 143 | default y |
| 144 | help | 144 | help |
| 145 | Make extra checks for space avaliable on stack in some | 145 | Make extra checks for space available on stack in some |
| 146 | critical functions. This will cause kernel to run a bit slower, | 146 | critical functions. This will cause kernel to run a bit slower, |
| 147 | but will catch most of kernel stack overruns and exit gracefuly. | 147 | but will catch most of kernel stack overruns and exit gracefuly. |
| 148 | 148 | ||
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 425db18580a2..9c80fc07384a 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype | |||
| @@ -258,7 +258,7 @@ config PPC_ICSWX_PID | |||
| 258 | default y | 258 | default y |
| 259 | ---help--- | 259 | ---help--- |
| 260 | The PID register in server is used explicitly for ICSWX. In | 260 | The PID register in server is used explicitly for ICSWX. In |
| 261 | embedded systems PID managment is done by the system. | 261 | embedded systems PID management is done by the system. |
| 262 | 262 | ||
| 263 | config PPC_ICSWX_USE_SIGILL | 263 | config PPC_ICSWX_USE_SIGILL |
| 264 | bool "Should a bad CT cause a SIGILL?" | 264 | bool "Should a bad CT cause a SIGILL?" |
| @@ -266,7 +266,7 @@ config PPC_ICSWX_USE_SIGILL | |||
| 266 | default n | 266 | default n |
| 267 | ---help--- | 267 | ---help--- |
| 268 | Should a bad CT used for "non-record form ICSWX" cause an | 268 | Should a bad CT used for "non-record form ICSWX" cause an |
| 269 | illegal intruction signal or should it be silent as | 269 | illegal instruction signal or should it be silent as |
| 270 | architected. | 270 | architected. |
| 271 | 271 | ||
| 272 | If in doubt, say N here. | 272 | If in doubt, say N here. |
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 178a5f300bc9..837cf49357ed 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig | |||
| @@ -67,7 +67,7 @@ config IO_EVENT_IRQ | |||
| 67 | 67 | ||
| 68 | This option will only enable the IO event platform code. You | 68 | This option will only enable the IO event platform code. You |
| 69 | will still need to enable or compile the actual drivers | 69 | will still need to enable or compile the actual drivers |
| 70 | that use this infrastruture to handle IO event interrupts. | 70 | that use this infrastructure to handle IO event interrupts. |
| 71 | 71 | ||
| 72 | Say Y if you are unsure. | 72 | Say Y if you are unsure. |
| 73 | 73 | ||
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu index ddf096c7d8bf..770ff2d5b94d 100644 --- a/arch/sh/Kconfig.cpu +++ b/arch/sh/Kconfig.cpu | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | menu "Processor features" | 1 | menu "Processor features" |
| 2 | 2 | ||
| 3 | choice | 3 | choice |
| 4 | prompt "Endianess selection" | 4 | prompt "Endianness selection" |
| 5 | default CPU_LITTLE_ENDIAN | 5 | default CPU_LITTLE_ENDIAN |
| 6 | help | 6 | help |
| 7 | Some SuperH machines can be configured for either little or big | 7 | Some SuperH machines can be configured for either little or big |
diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h index 198119910da5..b154de75c90c 100644 --- a/arch/x86/include/asm/atomic64_32.h +++ b/arch/x86/include/asm/atomic64_32.h | |||
| @@ -63,7 +63,7 @@ ATOMIC64_DECL(add_unless); | |||
| 63 | 63 | ||
| 64 | /** | 64 | /** |
| 65 | * atomic64_cmpxchg - cmpxchg atomic64 variable | 65 | * atomic64_cmpxchg - cmpxchg atomic64 variable |
| 66 | * @p: pointer to type atomic64_t | 66 | * @v: pointer to type atomic64_t |
| 67 | * @o: expected value | 67 | * @o: expected value |
| 68 | * @n: new value | 68 | * @n: new value |
| 69 | * | 69 | * |
| @@ -98,7 +98,7 @@ static inline long long atomic64_xchg(atomic64_t *v, long long n) | |||
| 98 | /** | 98 | /** |
| 99 | * atomic64_set - set atomic64 variable | 99 | * atomic64_set - set atomic64 variable |
| 100 | * @v: pointer to type atomic64_t | 100 | * @v: pointer to type atomic64_t |
| 101 | * @n: value to assign | 101 | * @i: value to assign |
| 102 | * | 102 | * |
| 103 | * Atomically sets the value of @v to @n. | 103 | * Atomically sets the value of @v to @n. |
| 104 | */ | 104 | */ |
| @@ -200,7 +200,7 @@ static inline long long atomic64_sub(long long i, atomic64_t *v) | |||
| 200 | * atomic64_sub_and_test - subtract value from variable and test result | 200 | * atomic64_sub_and_test - subtract value from variable and test result |
| 201 | * @i: integer value to subtract | 201 | * @i: integer value to subtract |
| 202 | * @v: pointer to type atomic64_t | 202 | * @v: pointer to type atomic64_t |
| 203 | * | 203 | * |
| 204 | * Atomically subtracts @i from @v and returns | 204 | * Atomically subtracts @i from @v and returns |
| 205 | * true if the result is zero, or false for all | 205 | * true if the result is zero, or false for all |
| 206 | * other cases. | 206 | * other cases. |
| @@ -224,9 +224,9 @@ static inline void atomic64_inc(atomic64_t *v) | |||
| 224 | 224 | ||
| 225 | /** | 225 | /** |
| 226 | * atomic64_dec - decrement atomic64 variable | 226 | * atomic64_dec - decrement atomic64 variable |
| 227 | * @ptr: pointer to type atomic64_t | 227 | * @v: pointer to type atomic64_t |
| 228 | * | 228 | * |
| 229 | * Atomically decrements @ptr by 1. | 229 | * Atomically decrements @v by 1. |
| 230 | */ | 230 | */ |
| 231 | static inline void atomic64_dec(atomic64_t *v) | 231 | static inline void atomic64_dec(atomic64_t *v) |
| 232 | { | 232 | { |
diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c index 5502b289341b..36565373af87 100644 --- a/arch/x86/kernel/cpu/match.c +++ b/arch/x86/kernel/cpu/match.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | * %X86_MODEL_ANY, %X86_FEATURE_ANY or 0 (except for vendor) | 23 | * %X86_MODEL_ANY, %X86_FEATURE_ANY or 0 (except for vendor) |
| 24 | * | 24 | * |
| 25 | * Arrays used to match for this should also be declared using | 25 | * Arrays used to match for this should also be declared using |
| 26 | * MODULE_DEVICE_TABLE(x86_cpu, ...) | 26 | * MODULE_DEVICE_TABLE(x86cpu, ...) |
| 27 | * | 27 | * |
| 28 | * This always matches against the boot cpu, assuming models and features are | 28 | * This always matches against the boot cpu, assuming models and features are |
| 29 | * consistent over all CPUs. | 29 | * consistent over all CPUs. |
diff --git a/arch/xtensa/variants/s6000/dmac.c b/arch/xtensa/variants/s6000/dmac.c index dc7f7c573518..340f5bb0b5ef 100644 --- a/arch/xtensa/variants/s6000/dmac.c +++ b/arch/xtensa/variants/s6000/dmac.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Authors: Oskar Schirmer <os@emlix.com> | 2 | * Authors: Oskar Schirmer <oskar@scara.com> |
| 3 | * Daniel Gloeckner <dg@emlix.com> | 3 | * Daniel Gloeckner <dg@emlix.com> |
| 4 | * (c) 2008 emlix GmbH http://www.emlix.com | 4 | * (c) 2008 emlix GmbH http://www.emlix.com |
| 5 | * | 5 | * |
diff --git a/arch/xtensa/variants/s6000/gpio.c b/arch/xtensa/variants/s6000/gpio.c index 7af0757e001b..b89541ba39ab 100644 --- a/arch/xtensa/variants/s6000/gpio.c +++ b/arch/xtensa/variants/s6000/gpio.c | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | * s6000 gpio driver | 2 | * s6000 gpio driver |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2009 emlix GmbH | 4 | * Copyright (c) 2009 emlix GmbH |
| 5 | * Authors: Oskar Schirmer <os@emlix.com> | 5 | * Authors: Oskar Schirmer <oskar@scara.com> |
| 6 | * Johannes Weiner <jw@emlix.com> | 6 | * Johannes Weiner <hannes@cmpxchg.org> |
| 7 | * Daniel Gloeckner <dg@emlix.com> | 7 | * Daniel Gloeckner <dg@emlix.com> |
| 8 | */ | 8 | */ |
| 9 | #include <linux/bitops.h> | 9 | #include <linux/bitops.h> |
diff --git a/arch/xtensa/variants/s6000/include/variant/dmac.h b/arch/xtensa/variants/s6000/include/variant/dmac.h index e81735b2a206..3f88d9fc6897 100644 --- a/arch/xtensa/variants/s6000/include/variant/dmac.h +++ b/arch/xtensa/variants/s6000/include/variant/dmac.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * Copyright (C) 2006 Tensilica Inc. | 8 | * Copyright (C) 2006 Tensilica Inc. |
| 9 | * Copyright (C) 2008 Emlix GmbH <info@emlix.com> | 9 | * Copyright (C) 2008 Emlix GmbH <info@emlix.com> |
| 10 | * Authors: Fabian Godehardt <fg@emlix.com> | 10 | * Authors: Fabian Godehardt <fg@emlix.com> |
| 11 | * Oskar Schirmer <os@emlix.com> | 11 | * Oskar Schirmer <oskar@scara.com> |
| 12 | * Daniel Gloeckner <dg@emlix.com> | 12 | * Daniel Gloeckner <dg@emlix.com> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
diff --git a/arch/xtensa/variants/s6000/irq.c b/arch/xtensa/variants/s6000/irq.c index 6651e3285fcf..81a241e79075 100644 --- a/arch/xtensa/variants/s6000/irq.c +++ b/arch/xtensa/variants/s6000/irq.c | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | * s6000 irq crossbar | 2 | * s6000 irq crossbar |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2009 emlix GmbH | 4 | * Copyright (c) 2009 emlix GmbH |
| 5 | * Authors: Johannes Weiner <jw@emlix.com> | 5 | * Authors: Johannes Weiner <hannes@cmpxchg.org> |
| 6 | * Oskar Schirmer <os@emlix.com> | 6 | * Oskar Schirmer <oskar@scara.com> |
| 7 | */ | 7 | */ |
| 8 | #include <linux/io.h> | 8 | #include <linux/io.h> |
| 9 | #include <asm/irq.h> | 9 | #include <asm/irq.h> |
diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig index 464fa2147dfb..f6b0a6e2ea50 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig | |||
| @@ -16,7 +16,7 @@ menuconfig PM_DEVFREQ | |||
| 16 | is attached to a single device and returns a "representative" | 16 | is attached to a single device and returns a "representative" |
| 17 | clock frequency of the device, which is also attached | 17 | clock frequency of the device, which is also attached |
| 18 | to a device by 1-to-1. The device registering devfreq takes the | 18 | to a device by 1-to-1. The device registering devfreq takes the |
| 19 | responsiblity to "interpret" the representative frequency and | 19 | responsibility to "interpret" the representative frequency and |
| 20 | to set its every clock accordingly with the "target" callback | 20 | to set its every clock accordingly with the "target" callback |
| 21 | given to devfreq. | 21 | given to devfreq. |
| 22 | 22 | ||
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index e48ab3108ad8..5b739411d62f 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h | |||
| @@ -107,13 +107,13 @@ extern int edac_debug_level; | |||
| 107 | * | 107 | * |
| 108 | * CPU caches (L1 and L2) | 108 | * CPU caches (L1 and L2) |
| 109 | * DMA engines | 109 | * DMA engines |
| 110 | * Core CPU swithces | 110 | * Core CPU switches |
| 111 | * Fabric switch units | 111 | * Fabric switch units |
| 112 | * PCIe interface controllers | 112 | * PCIe interface controllers |
| 113 | * other EDAC/ECC type devices that can be monitored for | 113 | * other EDAC/ECC type devices that can be monitored for |
| 114 | * errors, etc. | 114 | * errors, etc. |
| 115 | * | 115 | * |
| 116 | * It allows for a 2 level set of hiearchry. For example: | 116 | * It allows for a 2 level set of hierarchy. For example: |
| 117 | * | 117 | * |
| 118 | * cache could be composed of L1, L2 and L3 levels of cache. | 118 | * cache could be composed of L1, L2 and L3 levels of cache. |
| 119 | * Each CPU core would have its own L1 cache, while sharing | 119 | * Each CPU core would have its own L1 cache, while sharing |
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 4b154593343a..45b8f4bdd773 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c | |||
| @@ -56,7 +56,7 @@ static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev) | |||
| 56 | * | 56 | * |
| 57 | * The control structure is allocated in complete chunk | 57 | * The control structure is allocated in complete chunk |
| 58 | * from the OS. It is in turn sub allocated to the | 58 | * from the OS. It is in turn sub allocated to the |
| 59 | * various objects that compose the struture | 59 | * various objects that compose the structure |
| 60 | * | 60 | * |
| 61 | * The structure has a 'nr_instance' array within itself. | 61 | * The structure has a 'nr_instance' array within itself. |
| 62 | * Each instance represents a major component | 62 | * Each instance represents a major component |
| @@ -118,7 +118,7 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( | |||
| 118 | /* Calc the 'end' offset past the attributes array */ | 118 | /* Calc the 'end' offset past the attributes array */ |
| 119 | pvt = edac_align_ptr(&dev_attrib[count], sz_private); | 119 | pvt = edac_align_ptr(&dev_attrib[count], sz_private); |
| 120 | } else { | 120 | } else { |
| 121 | /* no attribute array specificed */ | 121 | /* no attribute array specified */ |
| 122 | pvt = edac_align_ptr(dev_attrib, sz_private); | 122 | pvt = edac_align_ptr(dev_attrib, sz_private); |
| 123 | } | 123 | } |
| 124 | 124 | ||
| @@ -394,7 +394,7 @@ static void edac_device_workq_function(struct work_struct *work_req) | |||
| 394 | 394 | ||
| 395 | /* Reschedule the workq for the next time period to start again | 395 | /* Reschedule the workq for the next time period to start again |
| 396 | * if the number of msec is for 1 sec, then adjust to the next | 396 | * if the number of msec is for 1 sec, then adjust to the next |
| 397 | * whole one second to save timers fireing all over the period | 397 | * whole one second to save timers firing all over the period |
| 398 | * between integral seconds | 398 | * between integral seconds |
| 399 | */ | 399 | */ |
| 400 | if (edac_dev->poll_msec == 1000) | 400 | if (edac_dev->poll_msec == 1000) |
| @@ -563,7 +563,7 @@ EXPORT_SYMBOL_GPL(edac_device_add_device); | |||
| 563 | * Remove sysfs entries for specified edac_device structure and | 563 | * Remove sysfs entries for specified edac_device structure and |
| 564 | * then remove edac_device structure from global list | 564 | * then remove edac_device structure from global list |
| 565 | * | 565 | * |
| 566 | * @pdev: | 566 | * @dev: |
| 567 | * Pointer to 'struct device' representing edac_device | 567 | * Pointer to 'struct device' representing edac_device |
| 568 | * structure to remove. | 568 | * structure to remove. |
| 569 | * | 569 | * |
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 85226ccf5290..7f1dfcc4e597 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c | |||
| @@ -90,7 +90,7 @@ MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices"); | |||
| 90 | #define MC_MAX_DOD 0x64 | 90 | #define MC_MAX_DOD 0x64 |
| 91 | 91 | ||
| 92 | /* | 92 | /* |
| 93 | * OFFSETS for Device 3 Function 4, as inicated on Xeon 5500 datasheet: | 93 | * OFFSETS for Device 3 Function 4, as indicated on Xeon 5500 datasheet: |
| 94 | * http://www.arrownac.com/manufacturers/intel/s/nehalem/5500-datasheet-v2.pdf | 94 | * http://www.arrownac.com/manufacturers/intel/s/nehalem/5500-datasheet-v2.pdf |
| 95 | */ | 95 | */ |
| 96 | 96 | ||
| @@ -101,7 +101,7 @@ MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices"); | |||
| 101 | #define DIMM1_COR_ERR(r) (((r) >> 16) & 0x7fff) | 101 | #define DIMM1_COR_ERR(r) (((r) >> 16) & 0x7fff) |
| 102 | #define DIMM0_COR_ERR(r) ((r) & 0x7fff) | 102 | #define DIMM0_COR_ERR(r) ((r) & 0x7fff) |
| 103 | 103 | ||
| 104 | /* OFFSETS for Device 3 Function 2, as inicated on Xeon 5500 datasheet */ | 104 | /* OFFSETS for Device 3 Function 2, as indicated on Xeon 5500 datasheet */ |
| 105 | #define MC_SSRCONTROL 0x48 | 105 | #define MC_SSRCONTROL 0x48 |
| 106 | #define SSR_MODE_DISABLE 0x00 | 106 | #define SSR_MODE_DISABLE 0x00 |
| 107 | #define SSR_MODE_ENABLE 0x01 | 107 | #define SSR_MODE_ENABLE 0x01 |
| @@ -398,7 +398,7 @@ static DEFINE_PCI_DEVICE_TABLE(i7core_pci_tbl) = { | |||
| 398 | }; | 398 | }; |
| 399 | 399 | ||
| 400 | /**************************************************************************** | 400 | /**************************************************************************** |
| 401 | Anciliary status routines | 401 | Ancillary status routines |
| 402 | ****************************************************************************/ | 402 | ****************************************************************************/ |
| 403 | 403 | ||
| 404 | /* MC_CONTROL bits */ | 404 | /* MC_CONTROL bits */ |
| @@ -1361,7 +1361,7 @@ static int i7core_get_onedevice(struct pci_dev **prev, | |||
| 1361 | dev_descr->dev_id, *prev); | 1361 | dev_descr->dev_id, *prev); |
| 1362 | 1362 | ||
| 1363 | /* | 1363 | /* |
| 1364 | * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core regs | 1364 | * On Xeon 55xx, the Intel QuickPath Arch Generic Non-core regs |
| 1365 | * is at addr 8086:2c40, instead of 8086:2c41. So, we need | 1365 | * is at addr 8086:2c40, instead of 8086:2c41. So, we need |
| 1366 | * to probe for the alternate address in case of failure | 1366 | * to probe for the alternate address in case of failure |
| 1367 | */ | 1367 | */ |
| @@ -2132,7 +2132,7 @@ static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 new_bw) | |||
| 2132 | 2132 | ||
| 2133 | /* | 2133 | /* |
| 2134 | * get_sdram_scrub_rate This routine convert current scrub rate value | 2134 | * get_sdram_scrub_rate This routine convert current scrub rate value |
| 2135 | * into byte/sec bandwidth accourding to | 2135 | * into byte/sec bandwidth according to |
| 2136 | * SCRUBINTERVAL formula found in datasheet. | 2136 | * SCRUBINTERVAL formula found in datasheet. |
| 2137 | */ | 2137 | */ |
| 2138 | static int get_sdram_scrub_rate(struct mem_ctl_info *mci) | 2138 | static int get_sdram_scrub_rate(struct mem_ctl_info *mci) |
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index a203536d90dd..123204f8e23b 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c | |||
| @@ -58,7 +58,7 @@ static int probed; | |||
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * FIXME: For now, let's order by device function, as it makes | 60 | * FIXME: For now, let's order by device function, as it makes |
| 61 | * easier for driver's development proccess. This table should be | 61 | * easier for driver's development process. This table should be |
| 62 | * moved to pci_id.h when submitted upstream | 62 | * moved to pci_id.h when submitted upstream |
| 63 | */ | 63 | */ |
| 64 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 /* 12.6 */ | 64 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 /* 12.6 */ |
| @@ -375,7 +375,7 @@ static DEFINE_PCI_DEVICE_TABLE(sbridge_pci_tbl) = { | |||
| 375 | 375 | ||
| 376 | 376 | ||
| 377 | /**************************************************************************** | 377 | /**************************************************************************** |
| 378 | Anciliary status routines | 378 | Ancillary status routines |
| 379 | ****************************************************************************/ | 379 | ****************************************************************************/ |
| 380 | 380 | ||
| 381 | static inline int numrank(u32 mtr) | 381 | static inline int numrank(u32 mtr) |
| @@ -1430,7 +1430,7 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci, | |||
| 1430 | type = "FATAL"; | 1430 | type = "FATAL"; |
| 1431 | 1431 | ||
| 1432 | /* | 1432 | /* |
| 1433 | * According with Table 15-9 of the Intel Archictecture spec vol 3A, | 1433 | * According with Table 15-9 of the Intel Architecture spec vol 3A, |
| 1434 | * memory errors should fit in this mask: | 1434 | * memory errors should fit in this mask: |
| 1435 | * 000f 0000 1mmm cccc (binary) | 1435 | * 000f 0000 1mmm cccc (binary) |
| 1436 | * where: | 1436 | * where: |
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index 0ebb7d4796fa..ef67e181377b 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
| @@ -1827,14 +1827,10 @@ void radeon_do_release(struct drm_device * dev) | |||
| 1827 | r600_do_cleanup_cp(dev); | 1827 | r600_do_cleanup_cp(dev); |
| 1828 | else | 1828 | else |
| 1829 | radeon_do_cleanup_cp(dev); | 1829 | radeon_do_cleanup_cp(dev); |
| 1830 | if (dev_priv->me_fw) { | 1830 | release_firmware(dev_priv->me_fw); |
| 1831 | release_firmware(dev_priv->me_fw); | 1831 | dev_priv->me_fw = NULL; |
| 1832 | dev_priv->me_fw = NULL; | 1832 | release_firmware(dev_priv->pfp_fw); |
| 1833 | } | 1833 | dev_priv->pfp_fw = NULL; |
| 1834 | if (dev_priv->pfp_fw) { | ||
| 1835 | release_firmware(dev_priv->pfp_fw); | ||
| 1836 | dev_priv->pfp_fw = NULL; | ||
| 1837 | } | ||
| 1838 | } | 1834 | } |
| 1839 | } | 1835 | } |
| 1840 | 1836 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index c58a036233fb..456a77cf4b7f 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c | |||
| @@ -551,7 +551,7 @@ int radeon_vm_bo_update_pte(struct radeon_device *rdev, | |||
| 551 | 551 | ||
| 552 | /* nothing to do if vm isn't bound */ | 552 | /* nothing to do if vm isn't bound */ |
| 553 | if (vm->id == -1) | 553 | if (vm->id == -1) |
| 554 | return 0;; | 554 | return 0; |
| 555 | 555 | ||
| 556 | bo_va = radeon_bo_va(bo, vm); | 556 | bo_va = radeon_bo_va(bo, vm); |
| 557 | if (bo_va == NULL) { | 557 | if (bo_va == NULL) { |
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index c7008b5210f7..0519b05968b5 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c | |||
| @@ -91,7 +91,7 @@ int radeon_gem_set_domain(struct drm_gem_object *gobj, | |||
| 91 | } | 91 | } |
| 92 | if (!domain) { | 92 | if (!domain) { |
| 93 | /* Do nothings */ | 93 | /* Do nothings */ |
| 94 | printk(KERN_WARNING "Set domain withou domain !\n"); | 94 | printk(KERN_WARNING "Set domain without domain !\n"); |
| 95 | return 0; | 95 | return 0; |
| 96 | } | 96 | } |
| 97 | if (domain == RADEON_GEM_DOMAIN_CPU) { | 97 | if (domain == RADEON_GEM_DOMAIN_CPU) { |
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e9c68fedfcff..034c80a10f1f 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
| @@ -470,7 +470,7 @@ config HID_PICOLCD_FB | |||
| 470 | select FB_SYS_FOPS | 470 | select FB_SYS_FOPS |
| 471 | ---help--- | 471 | ---help--- |
| 472 | Provide access to PicoLCD's 256x64 monochrome display via a | 472 | Provide access to PicoLCD's 256x64 monochrome display via a |
| 473 | frambuffer device. | 473 | framebuffer device. |
| 474 | 474 | ||
| 475 | config HID_PICOLCD_BACKLIGHT | 475 | config HID_PICOLCD_BACKLIGHT |
| 476 | bool "Backlight control" if EXPERT | 476 | bool "Backlight control" if EXPERT |
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 8deedc1b9840..e466ecba8dc1 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
| @@ -318,7 +318,7 @@ config SENSORS_EXYNOS4_TMU | |||
| 318 | tristate "Temperature sensor on Samsung EXYNOS4" | 318 | tristate "Temperature sensor on Samsung EXYNOS4" |
| 319 | depends on ARCH_EXYNOS4 | 319 | depends on ARCH_EXYNOS4 |
| 320 | help | 320 | help |
| 321 | If you say yes here you get support for TMU (Thermal Managment | 321 | If you say yes here you get support for TMU (Thermal Management |
| 322 | Unit) on SAMSUNG EXYNOS4 series of SoC. | 322 | Unit) on SAMSUNG EXYNOS4 series of SoC. |
| 323 | 323 | ||
| 324 | This driver can also be built as a module. If so, the module | 324 | This driver can also be built as a module. If so, the module |
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index d2c5095deeac..94468a64ce3a 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -351,7 +351,7 @@ config I2C_DAVINCI | |||
| 351 | For details please see http://www.ti.com/davinci | 351 | For details please see http://www.ti.com/davinci |
| 352 | 352 | ||
| 353 | config I2C_DESIGNWARE_PLATFORM | 353 | config I2C_DESIGNWARE_PLATFORM |
| 354 | tristate "Synopsys DesignWare Platfrom" | 354 | tristate "Synopsys DesignWare Platform" |
| 355 | depends on HAVE_CLK | 355 | depends on HAVE_CLK |
| 356 | help | 356 | help |
| 357 | If you say yes to this option, support will be included for the | 357 | If you say yes to this option, support will be included for the |
diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c index c64ba736f480..b76a29d1f8e4 100644 --- a/drivers/i2c/busses/i2c-s6000.c +++ b/drivers/i2c/busses/i2c-s6000.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Description: Driver for S6000 Family I2C Interface | 4 | * Description: Driver for S6000 Family I2C Interface |
| 5 | * Copyright (c) 2008 emlix GmbH | 5 | * Copyright (c) 2008 emlix GmbH |
| 6 | * Author: Oskar Schirmer <os@emlix.com> | 6 | * Author: Oskar Schirmer <oskar@scara.com> |
| 7 | * | 7 | * |
| 8 | * Partially based on i2c-bfin-twi.c driver by <sonic.zhang@analog.com> | 8 | * Partially based on i2c-bfin-twi.c driver by <sonic.zhang@analog.com> |
| 9 | * Copyright (c) 2005-2007 Analog Devices, Inc. | 9 | * Copyright (c) 2005-2007 Analog Devices, Inc. |
diff --git a/drivers/i2c/busses/i2c-s6000.h b/drivers/i2c/busses/i2c-s6000.h index ff23b81ded44..4936f9f2256f 100644 --- a/drivers/i2c/busses/i2c-s6000.h +++ b/drivers/i2c/busses/i2c-s6000.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * for more details. | 6 | * for more details. |
| 7 | * | 7 | * |
| 8 | * Copyright (C) 2008 Emlix GmbH <info@emlix.com> | 8 | * Copyright (C) 2008 Emlix GmbH <info@emlix.com> |
| 9 | * Author: Oskar Schirmer <os@emlix.com> | 9 | * Author: Oskar Schirmer <oskar@scara.com> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #ifndef __DRIVERS_I2C_BUSSES_I2C_S6000_H | 12 | #ifndef __DRIVERS_I2C_BUSSES_I2C_S6000_H |
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 3bd9fff5c589..c69843742bb0 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig | |||
| @@ -43,7 +43,7 @@ config AMD_IOMMU | |||
| 43 | With this option you can enable support for AMD IOMMU hardware in | 43 | With this option you can enable support for AMD IOMMU hardware in |
| 44 | your system. An IOMMU is a hardware component which provides | 44 | your system. An IOMMU is a hardware component which provides |
| 45 | remapping of DMA memory accesses from devices. With an AMD IOMMU you | 45 | remapping of DMA memory accesses from devices. With an AMD IOMMU you |
| 46 | can isolate the the DMA memory of different devices and protect the | 46 | can isolate the DMA memory of different devices and protect the |
| 47 | system from misbehaving device drivers or hardware. | 47 | system from misbehaving device drivers or hardware. |
| 48 | 48 | ||
| 49 | You can find out if your system has an AMD IOMMU if you look into | 49 | You can find out if your system has an AMD IOMMU if you look into |
| @@ -67,7 +67,7 @@ config AMD_IOMMU_V2 | |||
| 67 | ---help--- | 67 | ---help--- |
| 68 | This option enables support for the AMD IOMMUv2 features of the IOMMU | 68 | This option enables support for the AMD IOMMUv2 features of the IOMMU |
| 69 | hardware. Select this option if you want to use devices that support | 69 | hardware. Select this option if you want to use devices that support |
| 70 | the the PCI PRI and PASID interface. | 70 | the PCI PRI and PASID interface. |
| 71 | 71 | ||
| 72 | # Intel IOMMU support | 72 | # Intel IOMMU support |
| 73 | config DMAR_TABLE | 73 | config DMAR_TABLE |
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 49ef8b0794ae..220686159c15 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
| @@ -417,7 +417,7 @@ config MFD_MAX8925 | |||
| 417 | select MFD_CORE | 417 | select MFD_CORE |
| 418 | help | 418 | help |
| 419 | Say yes here to support for Maxim Semiconductor MAX8925. This is | 419 | Say yes here to support for Maxim Semiconductor MAX8925. This is |
| 420 | a Power Management IC. This driver provies common support for | 420 | a Power Management IC. This driver provides common support for |
| 421 | accessing the device, additional drivers must be enabled in order | 421 | accessing the device, additional drivers must be enabled in order |
| 422 | to use the functionality of the device. | 422 | to use the functionality of the device. |
| 423 | 423 | ||
| @@ -440,7 +440,7 @@ config MFD_MAX8998 | |||
| 440 | help | 440 | help |
| 441 | Say yes here to support for Maxim Semiconductor MAX8998 and | 441 | Say yes here to support for Maxim Semiconductor MAX8998 and |
| 442 | National Semiconductor LP3974. This is a Power Management IC. | 442 | National Semiconductor LP3974. This is a Power Management IC. |
| 443 | This driver provies common support for accessing the device, | 443 | This driver provides common support for accessing the device, |
| 444 | additional drivers must be enabled in order to use the functionality | 444 | additional drivers must be enabled in order to use the functionality |
| 445 | of the device. | 445 | of the device. |
| 446 | 446 | ||
| @@ -451,7 +451,7 @@ config MFD_S5M_CORE | |||
| 451 | select REGMAP_I2C | 451 | select REGMAP_I2C |
| 452 | help | 452 | help |
| 453 | Support for the Samsung Electronics S5M MFD series. | 453 | Support for the Samsung Electronics S5M MFD series. |
| 454 | This driver provies common support for accessing the device, | 454 | This driver provides common support for accessing the device, |
| 455 | additional drivers must be enabled in order to use the functionality | 455 | additional drivers must be enabled in order to use the functionality |
| 456 | of the device | 456 | of the device |
| 457 | 457 | ||
diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c index e7ff783aa31e..5a62e6bf89ae 100644 --- a/drivers/mfd/tps65911-comparator.c +++ b/drivers/mfd/tps65911-comparator.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #define COMP1 1 | 26 | #define COMP1 1 |
| 27 | #define COMP2 2 | 27 | #define COMP2 2 |
| 28 | 28 | ||
| 29 | /* Comparator 1 voltage selection table in milivolts */ | 29 | /* Comparator 1 voltage selection table in millivolts */ |
| 30 | static const u16 COMP_VSEL_TABLE[] = { | 30 | static const u16 COMP_VSEL_TABLE[] = { |
| 31 | 0, 2500, 2500, 2500, 2500, 2550, 2600, 2650, | 31 | 0, 2500, 2500, 2500, 2500, 2550, 2600, 2650, |
| 32 | 2700, 2750, 2800, 2850, 2900, 2950, 3000, 3050, | 32 | 2700, 2750, 2800, 2850, 2900, 2950, 3000, 3050, |
diff --git a/drivers/misc/c2port/Kconfig b/drivers/misc/c2port/Kconfig index e46af9a5810d..33ee834e1b83 100644 --- a/drivers/misc/c2port/Kconfig +++ b/drivers/misc/c2port/Kconfig | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | menuconfig C2PORT | 5 | menuconfig C2PORT |
| 6 | tristate "Silicon Labs C2 port support (EXPERIMENTAL)" | 6 | tristate "Silicon Labs C2 port support (EXPERIMENTAL)" |
| 7 | depends on EXPERIMENTAL | 7 | depends on EXPERIMENTAL |
| 8 | default no | 8 | default n |
| 9 | help | 9 | help |
| 10 | This option enables support for Silicon Labs C2 port used to | 10 | This option enables support for Silicon Labs C2 port used to |
| 11 | program Silicon micro controller chips (and other 8051 compatible). | 11 | program Silicon micro controller chips (and other 8051 compatible). |
| @@ -23,8 +23,8 @@ if C2PORT | |||
| 23 | 23 | ||
| 24 | config C2PORT_DURAMAR_2150 | 24 | config C2PORT_DURAMAR_2150 |
| 25 | tristate "C2 port support for Eurotech's Duramar 2150 (EXPERIMENTAL)" | 25 | tristate "C2 port support for Eurotech's Duramar 2150 (EXPERIMENTAL)" |
| 26 | depends on X86 && C2PORT | 26 | depends on X86 |
| 27 | default no | 27 | default n |
| 28 | help | 28 | help |
| 29 | This option enables C2 support for the Eurotech's Duramar 2150 | 29 | This option enables C2 support for the Eurotech's Duramar 2150 |
| 30 | on board micro controller. | 30 | on board micro controller. |
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c index 8272c02668d6..50aa90aa7a7f 100644 --- a/drivers/mtd/devices/docg3.c +++ b/drivers/mtd/devices/docg3.c | |||
| @@ -383,7 +383,7 @@ static void doc_set_device_id(struct docg3 *docg3, int id) | |||
| 383 | * leveling counters are stored. To access this last area of 4 bytes, a special | 383 | * leveling counters are stored. To access this last area of 4 bytes, a special |
| 384 | * mode must be input to the flash ASIC. | 384 | * mode must be input to the flash ASIC. |
| 385 | * | 385 | * |
| 386 | * Returns 0 if no error occured, -EIO else. | 386 | * Returns 0 if no error occurred, -EIO else. |
| 387 | */ | 387 | */ |
| 388 | static int doc_set_extra_page_mode(struct docg3 *docg3) | 388 | static int doc_set_extra_page_mode(struct docg3 *docg3) |
| 389 | { | 389 | { |
| @@ -681,7 +681,7 @@ out: | |||
| 681 | * - one read of 512 bytes at offset 0 | 681 | * - one read of 512 bytes at offset 0 |
| 682 | * - one read of 512 bytes at offset 512 + 16 | 682 | * - one read of 512 bytes at offset 512 + 16 |
| 683 | * | 683 | * |
| 684 | * Returns 0 if successful, -EIO if a read error occured. | 684 | * Returns 0 if successful, -EIO if a read error occurred. |
| 685 | */ | 685 | */ |
| 686 | static int doc_read_page_prepare(struct docg3 *docg3, int block0, int block1, | 686 | static int doc_read_page_prepare(struct docg3 *docg3, int block0, int block1, |
| 687 | int page, int offset) | 687 | int page, int offset) |
| @@ -839,7 +839,7 @@ static void calc_block_sector(loff_t from, int *block0, int *block1, int *page, | |||
| 839 | * | 839 | * |
| 840 | * Reads flash memory OOB area of pages. | 840 | * Reads flash memory OOB area of pages. |
| 841 | * | 841 | * |
| 842 | * Returns 0 if read successfull, of -EIO, -EINVAL if an error occured | 842 | * Returns 0 if read successful, of -EIO, -EINVAL if an error occurred |
| 843 | */ | 843 | */ |
| 844 | static int doc_read_oob(struct mtd_info *mtd, loff_t from, | 844 | static int doc_read_oob(struct mtd_info *mtd, loff_t from, |
| 845 | struct mtd_oob_ops *ops) | 845 | struct mtd_oob_ops *ops) |
| @@ -971,7 +971,7 @@ err_in_read: | |||
| 971 | * Reads flash memory pages. This function does not read the OOB chunk, but only | 971 | * Reads flash memory pages. This function does not read the OOB chunk, but only |
| 972 | * the page data. | 972 | * the page data. |
| 973 | * | 973 | * |
| 974 | * Returns 0 if read successfull, of -EIO, -EINVAL if an error occured | 974 | * Returns 0 if read successful, of -EIO, -EINVAL if an error occurred |
| 975 | */ | 975 | */ |
| 976 | static int doc_read(struct mtd_info *mtd, loff_t from, size_t len, | 976 | static int doc_read(struct mtd_info *mtd, loff_t from, size_t len, |
| 977 | size_t *retlen, u_char *buf) | 977 | size_t *retlen, u_char *buf) |
| @@ -1109,7 +1109,7 @@ static int doc_get_op_status(struct docg3 *docg3) | |||
| 1109 | * Wait for the chip to be ready again after erase or write operation, and check | 1109 | * Wait for the chip to be ready again after erase or write operation, and check |
| 1110 | * erase/write status. | 1110 | * erase/write status. |
| 1111 | * | 1111 | * |
| 1112 | * Returns 0 if erase successfull, -EIO if erase/write issue, -ETIMEOUT if | 1112 | * Returns 0 if erase successful, -EIO if erase/write issue, -ETIMEOUT if |
| 1113 | * timeout | 1113 | * timeout |
| 1114 | */ | 1114 | */ |
| 1115 | static int doc_write_erase_wait_status(struct docg3 *docg3) | 1115 | static int doc_write_erase_wait_status(struct docg3 *docg3) |
| @@ -1186,7 +1186,7 @@ static int doc_erase_block(struct docg3 *docg3, int block0, int block1) | |||
| 1186 | * Erase a bunch of contiguous blocks, by pairs, as a "mtd" page of 1024 is | 1186 | * Erase a bunch of contiguous blocks, by pairs, as a "mtd" page of 1024 is |
| 1187 | * split into 2 pages of 512 bytes on 2 contiguous blocks. | 1187 | * split into 2 pages of 512 bytes on 2 contiguous blocks. |
| 1188 | * | 1188 | * |
| 1189 | * Returns 0 if erase successful, -EINVAL if adressing error, -EIO if erase | 1189 | * Returns 0 if erase successful, -EINVAL if addressing error, -EIO if erase |
| 1190 | * issue | 1190 | * issue |
| 1191 | */ | 1191 | */ |
| 1192 | static int doc_erase(struct mtd_info *mtd, struct erase_info *info) | 1192 | static int doc_erase(struct mtd_info *mtd, struct erase_info *info) |
| @@ -1397,7 +1397,7 @@ static int doc_backup_oob(struct docg3 *docg3, loff_t to, | |||
| 1397 | * Or provide data without OOB, and then a all zeroed OOB will be used (ECC will | 1397 | * Or provide data without OOB, and then a all zeroed OOB will be used (ECC will |
| 1398 | * still be filled in if asked for). | 1398 | * still be filled in if asked for). |
| 1399 | * | 1399 | * |
| 1400 | * Returns 0 is successfull, EINVAL if length is not 14 bytes | 1400 | * Returns 0 is successful, EINVAL if length is not 14 bytes |
| 1401 | */ | 1401 | */ |
| 1402 | static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, | 1402 | static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, |
| 1403 | struct mtd_oob_ops *ops) | 1403 | struct mtd_oob_ops *ops) |
| @@ -1945,7 +1945,7 @@ static void doc_release_device(struct mtd_info *mtd) | |||
| 1945 | * docg3_resume - Awakens docg3 floor | 1945 | * docg3_resume - Awakens docg3 floor |
| 1946 | * @pdev: platfrom device | 1946 | * @pdev: platfrom device |
| 1947 | * | 1947 | * |
| 1948 | * Returns 0 (always successfull) | 1948 | * Returns 0 (always successful) |
| 1949 | */ | 1949 | */ |
| 1950 | static int docg3_resume(struct platform_device *pdev) | 1950 | static int docg3_resume(struct platform_device *pdev) |
| 1951 | { | 1951 | { |
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig index b60d6c5f29a0..03df9a8f2bbf 100644 --- a/drivers/net/can/sja1000/Kconfig +++ b/drivers/net/can/sja1000/Kconfig | |||
| @@ -75,7 +75,7 @@ config CAN_KVASER_PCI | |||
| 75 | tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards" | 75 | tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards" |
| 76 | depends on PCI | 76 | depends on PCI |
| 77 | ---help--- | 77 | ---help--- |
| 78 | This driver is for the the PCIcanx and PCIcan cards (1, 2 or | 78 | This driver is for the PCIcanx and PCIcan cards (1, 2 or |
| 79 | 4 channel) from Kvaser (http://www.kvaser.com). | 79 | 4 channel) from Kvaser (http://www.kvaser.com). |
| 80 | 80 | ||
| 81 | config CAN_PLX_PCI | 81 | config CAN_PLX_PCI |
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index 1234a14b2b73..b15366635147 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c | |||
| @@ -2549,8 +2549,7 @@ typhoon_init(void) | |||
| 2549 | static void __exit | 2549 | static void __exit |
| 2550 | typhoon_cleanup(void) | 2550 | typhoon_cleanup(void) |
| 2551 | { | 2551 | { |
| 2552 | if (typhoon_fw) | 2552 | release_firmware(typhoon_fw); |
| 2553 | release_firmware(typhoon_fw); | ||
| 2554 | pci_unregister_driver(&typhoon_driver); | 2553 | pci_unregister_driver(&typhoon_driver); |
| 2555 | } | 2554 | } |
| 2556 | 2555 | ||
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index d55df3290174..edeeb516807a 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
| @@ -15883,8 +15883,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev) | |||
| 15883 | if (dev) { | 15883 | if (dev) { |
| 15884 | struct tg3 *tp = netdev_priv(dev); | 15884 | struct tg3 *tp = netdev_priv(dev); |
| 15885 | 15885 | ||
| 15886 | if (tp->fw) | 15886 | release_firmware(tp->fw); |
| 15887 | release_firmware(tp->fw); | ||
| 15888 | 15887 | ||
| 15889 | tg3_reset_task_cancel(tp); | 15888 | tg3_reset_task_cancel(tp); |
| 15890 | 15889 | ||
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index 25c4e7f2a099..67cd2ed0306a 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c | |||
| @@ -3520,9 +3520,7 @@ static void __exit | |||
| 3520 | bnad_module_exit(void) | 3520 | bnad_module_exit(void) |
| 3521 | { | 3521 | { |
| 3522 | pci_unregister_driver(&bnad_pci_driver); | 3522 | pci_unregister_driver(&bnad_pci_driver); |
| 3523 | 3523 | release_firmware(bfi_fw); | |
| 3524 | if (bfi_fw) | ||
| 3525 | release_firmware(bfi_fw); | ||
| 3526 | } | 3524 | } |
| 3527 | 3525 | ||
| 3528 | module_init(bnad_module_init); | 3526 | module_init(bnad_module_init); |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index 0d725dc91bcb..8694124ef77d 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | |||
| @@ -1260,8 +1260,7 @@ next: | |||
| 1260 | void | 1260 | void |
| 1261 | netxen_release_firmware(struct netxen_adapter *adapter) | 1261 | netxen_release_firmware(struct netxen_adapter *adapter) |
| 1262 | { | 1262 | { |
| 1263 | if (adapter->fw) | 1263 | release_firmware(adapter->fw); |
| 1264 | release_firmware(adapter->fw); | ||
| 1265 | adapter->fw = NULL; | 1264 | adapter->fw = NULL; |
| 1266 | } | 1265 | } |
| 1267 | 1266 | ||
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index d32cf0ddf1b9..799fd40ed03a 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | |||
| @@ -1321,8 +1321,7 @@ next: | |||
| 1321 | void | 1321 | void |
| 1322 | qlcnic_release_firmware(struct qlcnic_adapter *adapter) | 1322 | qlcnic_release_firmware(struct qlcnic_adapter *adapter) |
| 1323 | { | 1323 | { |
| 1324 | if (adapter->fw) | 1324 | release_firmware(adapter->fw); |
| 1325 | release_firmware(adapter->fw); | ||
| 1326 | adapter->fw = NULL; | 1325 | adapter->fw = NULL; |
| 1327 | } | 1326 | } |
| 1328 | 1327 | ||
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 4f74b9762c29..00b4f56a671c 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
| @@ -6051,7 +6051,7 @@ static int rtl_open(struct net_device *dev) | |||
| 6051 | pm_runtime_get_sync(&pdev->dev); | 6051 | pm_runtime_get_sync(&pdev->dev); |
| 6052 | 6052 | ||
| 6053 | /* | 6053 | /* |
| 6054 | * Rx and Tx desscriptors needs 256 bytes alignment. | 6054 | * Rx and Tx descriptors needs 256 bytes alignment. |
| 6055 | * dma_alloc_coherent provides more. | 6055 | * dma_alloc_coherent provides more. |
| 6056 | */ | 6056 | */ |
| 6057 | tp->TxDescArray = dma_alloc_coherent(&pdev->dev, R8169_TX_RING_BYTES, | 6057 | tp->TxDescArray = dma_alloc_coherent(&pdev->dev, R8169_TX_RING_BYTES, |
diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c index 8e9fda0c7aeb..2ed3ab4b3c2d 100644 --- a/drivers/net/ethernet/s6gmac.c +++ b/drivers/net/ethernet/s6gmac.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Ethernet driver for S6105 on chip network device | 2 | * Ethernet driver for S6105 on chip network device |
| 3 | * (c)2008 emlix GmbH http://www.emlix.com | 3 | * (c)2008 emlix GmbH http://www.emlix.com |
| 4 | * Authors: Oskar Schirmer <os@emlix.com> | 4 | * Authors: Oskar Schirmer <oskar@scara.com> |
| 5 | * Daniel Gloeckner <dg@emlix.com> | 5 | * Daniel Gloeckner <dg@emlix.com> |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
| @@ -1070,4 +1070,4 @@ module_exit(s6gmac_exit); | |||
| 1070 | 1070 | ||
| 1071 | MODULE_LICENSE("GPL"); | 1071 | MODULE_LICENSE("GPL"); |
| 1072 | MODULE_DESCRIPTION("S6105 on chip Ethernet driver"); | 1072 | MODULE_DESCRIPTION("S6105 on chip Ethernet driver"); |
| 1073 | MODULE_AUTHOR("Oskar Schirmer <os@emlix.com>"); | 1073 | MODULE_AUTHOR("Oskar Schirmer <oskar@scara.com>"); |
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c index 8846516678c3..447a6932cab3 100644 --- a/drivers/net/ethernet/tehuti/tehuti.c +++ b/drivers/net/ethernet/tehuti/tehuti.c | |||
| @@ -341,8 +341,8 @@ static int bdx_fw_load(struct bdx_priv *priv) | |||
| 341 | out: | 341 | out: |
| 342 | if (master) | 342 | if (master) |
| 343 | WRITE_REG(priv, regINIT_SEMAPHORE, 1); | 343 | WRITE_REG(priv, regINIT_SEMAPHORE, 1); |
| 344 | if (fw) | 344 | |
| 345 | release_firmware(fw); | 345 | release_firmware(fw); |
| 346 | 346 | ||
| 347 | if (rc) { | 347 | if (rc) { |
| 348 | netdev_err(priv->ndev, "firmware loading failed\n"); | 348 | netdev_err(priv->ndev, "firmware loading failed\n"); |
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 031d8e8ed1ad..595205406d73 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig | |||
| @@ -316,7 +316,7 @@ config AU1000_FIR | |||
| 316 | tristate "Alchemy IrDA SIR/FIR" | 316 | tristate "Alchemy IrDA SIR/FIR" |
| 317 | depends on IRDA && MIPS_ALCHEMY | 317 | depends on IRDA && MIPS_ALCHEMY |
| 318 | help | 318 | help |
| 319 | Say Y/M here to build suppor the the IrDA peripheral on the | 319 | Say Y/M here to build support the IrDA peripheral on the |
| 320 | Alchemy Au1000 and Au1100 SoCs. | 320 | Alchemy Au1000 and Au1100 SoCs. |
| 321 | Say M to build a module; it will be called au1k_ir.ko | 321 | Say M to build a module; it will be called au1k_ir.ko |
| 322 | 322 | ||
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index e3b76d409dee..5003458980d3 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c | |||
| @@ -348,7 +348,7 @@ int superio_fixup_irq(struct pci_dev *pcidev) | |||
| 348 | BUG(); | 348 | BUG(); |
| 349 | return -1; | 349 | return -1; |
| 350 | } | 350 | } |
| 351 | printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %p\n", | 351 | printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %pf\n", |
| 352 | pci_name(pcidev), | 352 | pci_name(pcidev), |
| 353 | pcidev->vendor, pcidev->device, | 353 | pcidev->vendor, pcidev->device, |
| 354 | __builtin_return_address(0)); | 354 | __builtin_return_address(0)); |
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 6b26666b37f2..c4c1a5444b38 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /*-*-linux-c-*-*/ | 1 | /*-*-linux-c-*-*/ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | Copyright (C) 2007,2008 Jonathan Woithe <jwoithe@physics.adelaide.edu.au> | 4 | Copyright (C) 2007,2008 Jonathan Woithe <jwoithe@just42.net> |
| 5 | Copyright (C) 2008 Peter Gruber <nokos@gmx.net> | 5 | Copyright (C) 2008 Peter Gruber <nokos@gmx.net> |
| 6 | Copyright (C) 2008 Tony Vroon <tony@linx.net> | 6 | Copyright (C) 2008 Tony Vroon <tony@linx.net> |
| 7 | Based on earlier work: | 7 | Based on earlier work: |
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index 222ccd872ac5..f5d6d379f2fb 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c | |||
| @@ -451,7 +451,7 @@ static int bq27x00_battery_capacity_level(struct bq27x00_device_info *di, | |||
| 451 | } | 451 | } |
| 452 | 452 | ||
| 453 | /* | 453 | /* |
| 454 | * Return the battery Voltage in milivolts | 454 | * Return the battery Voltage in millivolts |
| 455 | * Or < 0 if something fails. | 455 | * Or < 0 if something fails. |
| 456 | */ | 456 | */ |
| 457 | static int bq27x00_battery_voltage(struct bq27x00_device_info *di, | 457 | static int bq27x00_battery_voltage(struct bq27x00_device_info *di, |
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index 5648dad71fb3..ffdf712f9a67 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig | |||
| @@ -70,7 +70,7 @@ config DP83640_PHY | |||
| 70 | using the SO_TIMESTAMPING API. | 70 | using the SO_TIMESTAMPING API. |
| 71 | 71 | ||
| 72 | In order for this to work, your MAC driver must also | 72 | In order for this to work, your MAC driver must also |
| 73 | implement the skb_tx_timetamp() function. | 73 | implement the skb_tx_timestamp() function. |
| 74 | 74 | ||
| 75 | config PTP_1588_CLOCK_PCH | 75 | config PTP_1588_CLOCK_PCH |
| 76 | tristate "Intel PCH EG20T as PTP clock" | 76 | tristate "Intel PCH EG20T as PTP clock" |
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 8dc3d9392bfa..4e01a423471b 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c | |||
| @@ -31,54 +31,54 @@ | |||
| 31 | TPS65910_SLEEP_CONTROL_EXT_INPUT_EN3 | \ | 31 | TPS65910_SLEEP_CONTROL_EXT_INPUT_EN3 | \ |
| 32 | TPS65911_SLEEP_CONTROL_EXT_INPUT_SLEEP) | 32 | TPS65911_SLEEP_CONTROL_EXT_INPUT_SLEEP) |
| 33 | 33 | ||
| 34 | /* supported VIO voltages in milivolts */ | 34 | /* supported VIO voltages in millivolts */ |
| 35 | static const u16 VIO_VSEL_table[] = { | 35 | static const u16 VIO_VSEL_table[] = { |
| 36 | 1500, 1800, 2500, 3300, | 36 | 1500, 1800, 2500, 3300, |
| 37 | }; | 37 | }; |
| 38 | 38 | ||
| 39 | /* VSEL tables for TPS65910 specific LDOs and dcdc's */ | 39 | /* VSEL tables for TPS65910 specific LDOs and dcdc's */ |
| 40 | 40 | ||
| 41 | /* supported VDD3 voltages in milivolts */ | 41 | /* supported VDD3 voltages in millivolts */ |
| 42 | static const u16 VDD3_VSEL_table[] = { | 42 | static const u16 VDD3_VSEL_table[] = { |
| 43 | 5000, | 43 | 5000, |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | /* supported VDIG1 voltages in milivolts */ | 46 | /* supported VDIG1 voltages in millivolts */ |
| 47 | static const u16 VDIG1_VSEL_table[] = { | 47 | static const u16 VDIG1_VSEL_table[] = { |
| 48 | 1200, 1500, 1800, 2700, | 48 | 1200, 1500, 1800, 2700, |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | /* supported VDIG2 voltages in milivolts */ | 51 | /* supported VDIG2 voltages in millivolts */ |
| 52 | static const u16 VDIG2_VSEL_table[] = { | 52 | static const u16 VDIG2_VSEL_table[] = { |
| 53 | 1000, 1100, 1200, 1800, | 53 | 1000, 1100, 1200, 1800, |
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | /* supported VPLL voltages in milivolts */ | 56 | /* supported VPLL voltages in millivolts */ |
| 57 | static const u16 VPLL_VSEL_table[] = { | 57 | static const u16 VPLL_VSEL_table[] = { |
| 58 | 1000, 1100, 1800, 2500, | 58 | 1000, 1100, 1800, 2500, |
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | /* supported VDAC voltages in milivolts */ | 61 | /* supported VDAC voltages in millivolts */ |
| 62 | static const u16 VDAC_VSEL_table[] = { | 62 | static const u16 VDAC_VSEL_table[] = { |
| 63 | 1800, 2600, 2800, 2850, | 63 | 1800, 2600, 2800, 2850, |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | /* supported VAUX1 voltages in milivolts */ | 66 | /* supported VAUX1 voltages in millivolts */ |
| 67 | static const u16 VAUX1_VSEL_table[] = { | 67 | static const u16 VAUX1_VSEL_table[] = { |
| 68 | 1800, 2500, 2800, 2850, | 68 | 1800, 2500, 2800, 2850, |
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | /* supported VAUX2 voltages in milivolts */ | 71 | /* supported VAUX2 voltages in millivolts */ |
| 72 | static const u16 VAUX2_VSEL_table[] = { | 72 | static const u16 VAUX2_VSEL_table[] = { |
| 73 | 1800, 2800, 2900, 3300, | 73 | 1800, 2800, 2900, 3300, |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | /* supported VAUX33 voltages in milivolts */ | 76 | /* supported VAUX33 voltages in millivolts */ |
| 77 | static const u16 VAUX33_VSEL_table[] = { | 77 | static const u16 VAUX33_VSEL_table[] = { |
| 78 | 1800, 2000, 2800, 3300, | 78 | 1800, 2000, 2800, 3300, |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | /* supported VMMC voltages in milivolts */ | 81 | /* supported VMMC voltages in millivolts */ |
| 82 | static const u16 VMMC_VSEL_table[] = { | 82 | static const u16 VMMC_VSEL_table[] = { |
| 83 | 1800, 2800, 3000, 3300, | 83 | 1800, 2800, 3000, 3300, |
| 84 | }; | 84 | }; |
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index e756a0df3664..d6f8adaa26ef 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c | |||
| @@ -1105,8 +1105,7 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context) | |||
| 1105 | goto out; | 1105 | goto out; |
| 1106 | 1106 | ||
| 1107 | out: | 1107 | out: |
| 1108 | if (fw) | 1108 | release_firmware(fw); |
| 1109 | release_firmware(fw); | ||
| 1110 | /* allow rproc_unregister() contexts, if any, to proceed */ | 1109 | /* allow rproc_unregister() contexts, if any, to proceed */ |
| 1111 | complete_all(&rproc->firmware_loading_complete); | 1110 | complete_all(&rproc->firmware_loading_complete); |
| 1112 | } | 1111 | } |
diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c b/drivers/scsi/aic94xx/aic94xx_seq.c index 390168f62a13..5fdca93892ad 100644 --- a/drivers/scsi/aic94xx/aic94xx_seq.c +++ b/drivers/scsi/aic94xx/aic94xx_seq.c | |||
| @@ -1228,8 +1228,7 @@ static int asd_seq_start_lseq(struct asd_ha_struct *asd_ha, int lseq) | |||
| 1228 | 1228 | ||
| 1229 | int asd_release_firmware(void) | 1229 | int asd_release_firmware(void) |
| 1230 | { | 1230 | { |
| 1231 | if (sequencer_fw) | 1231 | release_firmware(sequencer_fw); |
| 1232 | release_firmware(sequencer_fw); | ||
| 1233 | return 0; | 1232 | return 0; |
| 1234 | } | 1233 | } |
| 1235 | 1234 | ||
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c index 394ed9e79fd4..34552bf1c023 100644 --- a/drivers/scsi/esp_scsi.c +++ b/drivers/scsi/esp_scsi.c | |||
| @@ -1000,7 +1000,7 @@ static int esp_check_spur_intr(struct esp *esp) | |||
| 1000 | 1000 | ||
| 1001 | static void esp_schedule_reset(struct esp *esp) | 1001 | static void esp_schedule_reset(struct esp *esp) |
| 1002 | { | 1002 | { |
| 1003 | esp_log_reset("ESP: esp_schedule_reset() from %p\n", | 1003 | esp_log_reset("ESP: esp_schedule_reset() from %pf\n", |
| 1004 | __builtin_return_address(0)); | 1004 | __builtin_return_address(0)); |
| 1005 | esp->flags |= ESP_FLAG_RESETTING; | 1005 | esp->flags |= ESP_FLAG_RESETTING; |
| 1006 | esp_event(esp, ESP_EVENT_RESET); | 1006 | esp_event(esp, ESP_EVENT_RESET); |
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 6c6486f626ee..538230be5cca 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
| @@ -4473,17 +4473,14 @@ qla1280_exit(void) | |||
| 4473 | pci_unregister_driver(&qla1280_pci_driver); | 4473 | pci_unregister_driver(&qla1280_pci_driver); |
| 4474 | /* release any allocated firmware images */ | 4474 | /* release any allocated firmware images */ |
| 4475 | for (i = 0; i < QL_NUM_FW_IMAGES; i++) { | 4475 | for (i = 0; i < QL_NUM_FW_IMAGES; i++) { |
| 4476 | if (qla1280_fw_tbl[i].fw) { | 4476 | release_firmware(qla1280_fw_tbl[i].fw); |
| 4477 | release_firmware(qla1280_fw_tbl[i].fw); | 4477 | qla1280_fw_tbl[i].fw = NULL; |
| 4478 | qla1280_fw_tbl[i].fw = NULL; | ||
| 4479 | } | ||
| 4480 | } | 4478 | } |
| 4481 | } | 4479 | } |
| 4482 | 4480 | ||
| 4483 | module_init(qla1280_init); | 4481 | module_init(qla1280_init); |
| 4484 | module_exit(qla1280_exit); | 4482 | module_exit(qla1280_exit); |
| 4485 | 4483 | ||
| 4486 | |||
| 4487 | MODULE_AUTHOR("Qlogic & Jes Sorensen"); | 4484 | MODULE_AUTHOR("Qlogic & Jes Sorensen"); |
| 4488 | MODULE_DESCRIPTION("Qlogic ISP SCSI (qla1x80/qla1x160) driver"); | 4485 | MODULE_DESCRIPTION("Qlogic ISP SCSI (qla1x80/qla1x160) driver"); |
| 4489 | MODULE_LICENSE("GPL"); | 4486 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 7db803377c64..c9c56a8427f3 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -4122,8 +4122,7 @@ qla2x00_release_firmware(void) | |||
| 4122 | 4122 | ||
| 4123 | mutex_lock(&qla_fw_lock); | 4123 | mutex_lock(&qla_fw_lock); |
| 4124 | for (idx = 0; idx < FW_BLOBS; idx++) | 4124 | for (idx = 0; idx < FW_BLOBS; idx++) |
| 4125 | if (qla_fw_blobs[idx].fw) | 4125 | release_firmware(qla_fw_blobs[idx].fw); |
| 4126 | release_firmware(qla_fw_blobs[idx].fw); | ||
| 4127 | mutex_unlock(&qla_fw_lock); | 4126 | mutex_unlock(&qla_fw_lock); |
| 4128 | } | 4127 | } |
| 4129 | 4128 | ||
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 386f0c53bea7..d0f71e5d065f 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
| @@ -664,7 +664,7 @@ static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd) | |||
| 664 | } | 664 | } |
| 665 | 665 | ||
| 666 | /** | 666 | /** |
| 667 | * scsi_eh_prep_cmnd - Save a scsi command info as part of error recory | 667 | * scsi_eh_prep_cmnd - Save a scsi command info as part of error recovery |
| 668 | * @scmd: SCSI command structure to hijack | 668 | * @scmd: SCSI command structure to hijack |
| 669 | * @ses: structure to save restore information | 669 | * @ses: structure to save restore information |
| 670 | * @cmnd: CDB to send. Can be NULL if no new cmnd is needed | 670 | * @cmnd: CDB to send. Can be NULL if no new cmnd is needed |
| @@ -739,7 +739,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, | |||
| 739 | EXPORT_SYMBOL(scsi_eh_prep_cmnd); | 739 | EXPORT_SYMBOL(scsi_eh_prep_cmnd); |
| 740 | 740 | ||
| 741 | /** | 741 | /** |
| 742 | * scsi_eh_restore_cmnd - Restore a scsi command info as part of error recory | 742 | * scsi_eh_restore_cmnd - Restore a scsi command info as part of error recovery |
| 743 | * @scmd: SCSI command structure to restore | 743 | * @scmd: SCSI command structure to restore |
| 744 | * @ses: saved information from a coresponding call to scsi_eh_prep_cmnd | 744 | * @ses: saved information from a coresponding call to scsi_eh_prep_cmnd |
| 745 | * | 745 | * |
| @@ -762,7 +762,7 @@ void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses) | |||
| 762 | EXPORT_SYMBOL(scsi_eh_restore_cmnd); | 762 | EXPORT_SYMBOL(scsi_eh_restore_cmnd); |
| 763 | 763 | ||
| 764 | /** | 764 | /** |
| 765 | * scsi_send_eh_cmnd - submit a scsi command as part of error recory | 765 | * scsi_send_eh_cmnd - submit a scsi command as part of error recovery |
| 766 | * @scmd: SCSI command structure to hijack | 766 | * @scmd: SCSI command structure to hijack |
| 767 | * @cmnd: CDB to send | 767 | * @cmnd: CDB to send |
| 768 | * @cmnd_size: size in bytes of @cmnd | 768 | * @cmnd_size: size in bytes of @cmnd |
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index 15a42c8c1943..5b3f5fffea92 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c | |||
| @@ -914,7 +914,7 @@ static int gs_put_char(struct tty_struct *tty, unsigned char ch) | |||
| 914 | unsigned long flags; | 914 | unsigned long flags; |
| 915 | int status; | 915 | int status; |
| 916 | 916 | ||
| 917 | pr_vdebug("gs_put_char: (%d,%p) char=0x%x, called from %p\n", | 917 | pr_vdebug("gs_put_char: (%d,%p) char=0x%x, called from %pf\n", |
| 918 | port->port_num, tty, ch, __builtin_return_address(0)); | 918 | port->port_num, tty, ch, __builtin_return_address(0)); |
| 919 | 919 | ||
| 920 | spin_lock_irqsave(&port->port_lock, flags); | 920 | spin_lock_irqsave(&port->port_lock, flags); |
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 74a14f6ed34c..83e58df29fe3 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
| @@ -153,7 +153,7 @@ config USB_EHCI_HCD_OMAP | |||
| 153 | bool "EHCI support for OMAP3 and later chips" | 153 | bool "EHCI support for OMAP3 and later chips" |
| 154 | depends on USB_EHCI_HCD && ARCH_OMAP | 154 | depends on USB_EHCI_HCD && ARCH_OMAP |
| 155 | default y | 155 | default y |
| 156 | --- help --- | 156 | ---help--- |
| 157 | Enables support for the on-chip EHCI controller on | 157 | Enables support for the on-chip EHCI controller on |
| 158 | OMAP3 and later chips. | 158 | OMAP3 and later chips. |
| 159 | 159 | ||
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 8f3cbb8dc81b..1719886bb9be 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -110,7 +110,7 @@ UNUSUAL_DEV( 0x040d, 0x6205, 0x0003, 0x0003, | |||
| 110 | USB_SC_DEVICE, USB_PR_DEVICE, NULL, | 110 | USB_SC_DEVICE, USB_PR_DEVICE, NULL, |
| 111 | US_FL_IGNORE_RESIDUE ), | 111 | US_FL_IGNORE_RESIDUE ), |
| 112 | 112 | ||
| 113 | /* Deduced by Jonathan Woithe <jwoithe@physics.adelaide.edu.au> | 113 | /* Deduced by Jonathan Woithe <jwoithe@just42.net> |
| 114 | * Entry needed for flags: US_FL_FIX_INQUIRY because initial inquiry message | 114 | * Entry needed for flags: US_FL_FIX_INQUIRY because initial inquiry message |
| 115 | * always fails and confuses drive. | 115 | * always fails and confuses drive. |
| 116 | */ | 116 | */ |
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c index ffbce4525468..fe3b6ec87122 100644 --- a/drivers/video/au1100fb.c +++ b/drivers/video/au1100fb.c | |||
| @@ -536,7 +536,7 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev) | |||
| 536 | for (page = (unsigned long)fbdev->fb_mem; | 536 | for (page = (unsigned long)fbdev->fb_mem; |
| 537 | page < PAGE_ALIGN((unsigned long)fbdev->fb_mem + fbdev->fb_len); | 537 | page < PAGE_ALIGN((unsigned long)fbdev->fb_mem + fbdev->fb_len); |
| 538 | page += PAGE_SIZE) { | 538 | page += PAGE_SIZE) { |
| 539 | #if CONFIG_DMA_NONCOHERENT | 539 | #ifdef CONFIG_DMA_NONCOHERENT |
| 540 | SetPageReserved(virt_to_page(CAC_ADDR((void *)page))); | 540 | SetPageReserved(virt_to_page(CAC_ADDR((void *)page))); |
| 541 | #else | 541 | #else |
| 542 | SetPageReserved(virt_to_page(page)); | 542 | SetPageReserved(virt_to_page(page)); |
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig index fd2c7bd9dfbe..6743bde038cc 100644 --- a/drivers/w1/Kconfig +++ b/drivers/w1/Kconfig | |||
| @@ -16,7 +16,7 @@ config W1_CON | |||
| 16 | depends on CONNECTOR | 16 | depends on CONNECTOR |
| 17 | bool "Userspace communication over connector" | 17 | bool "Userspace communication over connector" |
| 18 | default y | 18 | default y |
| 19 | --- help --- | 19 | ---help--- |
| 20 | This allows to communicate with userspace using connector. For more | 20 | This allows to communicate with userspace using connector. For more |
| 21 | information see <file:Documentation/connector/connector.txt>. | 21 | information see <file:Documentation/connector/connector.txt>. |
| 22 | There are three types of messages between w1 core and userspace: | 22 | There are three types of messages between w1 core and userspace: |
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 37096246c937..eeea76f4dccb 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -937,7 +937,7 @@ config BCM47XX_WDT | |||
| 937 | tristate "Broadcom BCM47xx Watchdog Timer" | 937 | tristate "Broadcom BCM47xx Watchdog Timer" |
| 938 | depends on BCM47XX | 938 | depends on BCM47XX |
| 939 | help | 939 | help |
| 940 | Hardware driver for the Broadcom BCM47xx Watchog Timer. | 940 | Hardware driver for the Broadcom BCM47xx Watchdog Timer. |
| 941 | 941 | ||
| 942 | config RC32434_WDT | 942 | config RC32434_WDT |
| 943 | tristate "IDT RC32434 SoC Watchdog Timer" | 943 | tristate "IDT RC32434 SoC Watchdog Timer" |
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index ea20c51d24c7..8d2501e604dd 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig | |||
| @@ -71,7 +71,7 @@ config XEN_DEV_EVTCHN | |||
| 71 | tristate "Xen /dev/xen/evtchn device" | 71 | tristate "Xen /dev/xen/evtchn device" |
| 72 | default y | 72 | default y |
| 73 | help | 73 | help |
| 74 | The evtchn driver allows a userspace process to triger event | 74 | The evtchn driver allows a userspace process to trigger event |
| 75 | channels and to receive notification of an event channel | 75 | channels and to receive notification of an event channel |
| 76 | firing. | 76 | firing. |
| 77 | If in doubt, say yes. | 77 | If in doubt, say yes. |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index a7ffc88a7dbe..e1fe74a2ce16 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -2753,7 +2753,7 @@ static int write_dev_flush(struct btrfs_device *device, int wait) | |||
| 2753 | * one reference for us, and we leave it for the | 2753 | * one reference for us, and we leave it for the |
| 2754 | * caller | 2754 | * caller |
| 2755 | */ | 2755 | */ |
| 2756 | device->flush_bio = NULL;; | 2756 | device->flush_bio = NULL; |
| 2757 | bio = bio_alloc(GFP_NOFS, 0); | 2757 | bio = bio_alloc(GFP_NOFS, 0); |
| 2758 | if (!bio) | 2758 | if (!bio) |
| 2759 | return -ENOMEM; | 2759 | return -ENOMEM; |
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h index 1d7a3f7b3b5d..dcc9631b3052 100644 --- a/include/linux/mfd/wm831x/pdata.h +++ b/include/linux/mfd/wm831x/pdata.h | |||
| @@ -26,7 +26,7 @@ struct wm831x_backlight_pdata { | |||
| 26 | struct wm831x_backup_pdata { | 26 | struct wm831x_backup_pdata { |
| 27 | int charger_enable; | 27 | int charger_enable; |
| 28 | int no_constant_voltage; /** Disable constant voltage charging */ | 28 | int no_constant_voltage; /** Disable constant voltage charging */ |
| 29 | int vlim; /** Voltage limit in milivolts */ | 29 | int vlim; /** Voltage limit in millivolts */ |
| 30 | int ilim; /** Current limit in microamps */ | 30 | int ilim; /** Current limit in microamps */ |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index dff711509661..41aa49b74821 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | /* | 30 | /* |
| 31 | * PAGE_ALLOC_COSTLY_ORDER is the order at which allocations are deemed | 31 | * PAGE_ALLOC_COSTLY_ORDER is the order at which allocations are deemed |
| 32 | * costly to service. That is between allocation orders which should | 32 | * costly to service. That is between allocation orders which should |
| 33 | * coelesce naturally under reasonable reclaim pressure and those which | 33 | * coalesce naturally under reasonable reclaim pressure and those which |
| 34 | * will not. | 34 | * will not. |
| 35 | */ | 35 | */ |
| 36 | #define PAGE_ALLOC_COSTLY_ORDER 3 | 36 | #define PAGE_ALLOC_COSTLY_ORDER 3 |
diff --git a/include/linux/rational.h b/include/linux/rational.h index 4f532fcd9eea..bfa6a2bcfb32 100644 --- a/include/linux/rational.h +++ b/include/linux/rational.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * rational fractions | 2 | * rational fractions |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2009 emlix GmbH, Oskar Schirmer <os@emlix.com> | 4 | * Copyright (C) 2009 emlix GmbH, Oskar Schirmer <oskar@scara.com> |
| 5 | * | 5 | * |
| 6 | * helper functions when coping with rational numbers, | 6 | * helper functions when coping with rational numbers, |
| 7 | * e.g. when calculating optimum numerator/denominator pairs for | 7 | * e.g. when calculating optimum numerator/denominator pairs for |
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index d9b42c5be088..4c5b63283377 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
| @@ -426,7 +426,7 @@ struct tcp_sock { | |||
| 426 | 426 | ||
| 427 | struct sk_buff_head out_of_order_queue; /* Out of order segments go here */ | 427 | struct sk_buff_head out_of_order_queue; /* Out of order segments go here */ |
| 428 | 428 | ||
| 429 | /* SACKs data, these 2 need to be together (see tcp_build_and_update_options) */ | 429 | /* SACKs data, these 2 need to be together (see tcp_options_write) */ |
| 430 | struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */ | 430 | struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */ |
| 431 | struct tcp_sack_block selective_acks[4]; /* The SACKS themselves*/ | 431 | struct tcp_sack_block selective_acks[4]; /* The SACKS themselves*/ |
| 432 | 432 | ||
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h index 7d497291c85d..4018f5058f27 100644 --- a/include/trace/events/workqueue.h +++ b/include/trace/events/workqueue.h | |||
| @@ -103,7 +103,7 @@ TRACE_EVENT(workqueue_execute_start, | |||
| 103 | ); | 103 | ); |
| 104 | 104 | ||
| 105 | /** | 105 | /** |
| 106 | * workqueue_execute_end - called immediately before the workqueue callback | 106 | * workqueue_execute_end - called immediately after the workqueue callback |
| 107 | * @work: pointer to struct work_struct | 107 | * @work: pointer to struct work_struct |
| 108 | * | 108 | * |
| 109 | * Allows to track workqueue execution. | 109 | * Allows to track workqueue execution. |
diff --git a/kernel/semaphore.c b/kernel/semaphore.c index 60636a4e25c3..4567fc020fe3 100644 --- a/kernel/semaphore.c +++ b/kernel/semaphore.c | |||
| @@ -118,7 +118,7 @@ EXPORT_SYMBOL(down_killable); | |||
| 118 | * down_trylock - try to acquire the semaphore, without waiting | 118 | * down_trylock - try to acquire the semaphore, without waiting |
| 119 | * @sem: the semaphore to be acquired | 119 | * @sem: the semaphore to be acquired |
| 120 | * | 120 | * |
| 121 | * Try to acquire the semaphore atomically. Returns 0 if the mutex has | 121 | * Try to acquire the semaphore atomically. Returns 0 if the semaphore has |
| 122 | * been acquired successfully or 1 if it it cannot be acquired. | 122 | * been acquired successfully or 1 if it it cannot be acquired. |
| 123 | * | 123 | * |
| 124 | * NOTE: This return value is inverted from both spin_trylock and | 124 | * NOTE: This return value is inverted from both spin_trylock and |
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index d81a1a532994..f347ac91292d 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
| @@ -271,7 +271,7 @@ config PROFILE_ANNOTATED_BRANCHES | |||
| 271 | bool "Trace likely/unlikely profiler" | 271 | bool "Trace likely/unlikely profiler" |
| 272 | select TRACE_BRANCH_PROFILING | 272 | select TRACE_BRANCH_PROFILING |
| 273 | help | 273 | help |
| 274 | This tracer profiles all the the likely and unlikely macros | 274 | This tracer profiles all likely and unlikely macros |
| 275 | in the kernel. It will display the results in: | 275 | in the kernel. It will display the results in: |
| 276 | 276 | ||
| 277 | /sys/kernel/debug/tracing/trace_stat/branch_annotated | 277 | /sys/kernel/debug/tracing/trace_stat/branch_annotated |
diff --git a/lib/rational.c b/lib/rational.c index d326da3976f5..f0aa21c2a762 100644 --- a/lib/rational.c +++ b/lib/rational.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * rational fractions | 2 | * rational fractions |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2009 emlix GmbH, Oskar Schirmer <os@emlix.com> | 4 | * Copyright (C) 2009 emlix GmbH, Oskar Schirmer <oskar@scara.com> |
| 5 | * | 5 | * |
| 6 | * helper functions when coping with rational numbers | 6 | * helper functions when coping with rational numbers |
| 7 | */ | 7 | */ |
diff --git a/net/atm/lec.h b/net/atm/lec.h index c730e57de199..a86aff9a3c04 100644 --- a/net/atm/lec.h +++ b/net/atm/lec.h | |||
| @@ -55,11 +55,11 @@ struct lane2_ops { | |||
| 55 | * frames. | 55 | * frames. |
| 56 | * | 56 | * |
| 57 | * 1. Dix Ethernet EtherType frames encoded by placing EtherType | 57 | * 1. Dix Ethernet EtherType frames encoded by placing EtherType |
| 58 | * field in h_type field. Data follows immediatelly after header. | 58 | * field in h_type field. Data follows immediately after header. |
| 59 | * 2. LLC Data frames whose total length, including LLC field and data, | 59 | * 2. LLC Data frames whose total length, including LLC field and data, |
| 60 | * but not padding required to meet the minimum data frame length, | 60 | * but not padding required to meet the minimum data frame length, |
| 61 | * is less than 1536(0x0600) MUST be encoded by placing that length | 61 | * is less than 1536(0x0600) MUST be encoded by placing that length |
| 62 | * in the h_type field. The LLC field follows header immediatelly. | 62 | * in the h_type field. The LLC field follows header immediately. |
| 63 | * 3. LLC data frames longer than this maximum MUST be encoded by placing | 63 | * 3. LLC data frames longer than this maximum MUST be encoded by placing |
| 64 | * the value 0 in the h_type field. | 64 | * the value 0 in the h_type field. |
| 65 | * | 65 | * |
diff --git a/net/caif/Kconfig b/net/caif/Kconfig index 936361e5a2b6..d3694953b1d7 100644 --- a/net/caif/Kconfig +++ b/net/caif/Kconfig | |||
| @@ -25,7 +25,7 @@ config CAIF_DEBUG | |||
| 25 | bool "Enable Debug" | 25 | bool "Enable Debug" |
| 26 | depends on CAIF | 26 | depends on CAIF |
| 27 | default n | 27 | default n |
| 28 | --- help --- | 28 | ---help--- |
| 29 | Enable the inclusion of debug code in the CAIF stack. | 29 | Enable the inclusion of debug code in the CAIF stack. |
| 30 | Be aware that doing this will impact performance. | 30 | Be aware that doing this will impact performance. |
| 31 | If unsure say N. | 31 | If unsure say N. |
diff --git a/sound/isa/als100.c b/sound/isa/als100.c index d1f4351fb6ee..2d67c78c9f4b 100644 --- a/sound/isa/als100.c +++ b/sound/isa/als100.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | Thanks to Pierfrancesco 'qM2' Passerini. | 7 | Thanks to Pierfrancesco 'qM2' Passerini. |
| 8 | 8 | ||
| 9 | Generalised for soundcards based on DT-0196 and ALS-007 chips | 9 | Generalised for soundcards based on DT-0196 and ALS-007 chips |
| 10 | by Jonathan Woithe <jwoithe@physics.adelaide.edu.au>: June 2002. | 10 | by Jonathan Woithe <jwoithe@just42.net>: June 2002. |
| 11 | 11 | ||
| 12 | This program is free software; you can redistribute it and/or modify | 12 | This program is free software; you can redistribute it and/or modify |
| 13 | it under the terms of the GNU General Public License as published by | 13 | it under the terms of the GNU General Public License as published by |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7810913d07a0..708d47c294ee 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * Copyright (c) 2004 Kailang Yang <kailang@realtek.com.tw> | 6 | * Copyright (c) 2004 Kailang Yang <kailang@realtek.com.tw> |
| 7 | * PeiSen Hou <pshou@realtek.com.tw> | 7 | * PeiSen Hou <pshou@realtek.com.tw> |
| 8 | * Takashi Iwai <tiwai@suse.de> | 8 | * Takashi Iwai <tiwai@suse.de> |
| 9 | * Jonathan Woithe <jwoithe@physics.adelaide.edu.au> | 9 | * Jonathan Woithe <jwoithe@just42.net> |
| 10 | * | 10 | * |
| 11 | * This driver is free software; you can redistribute it and/or modify | 11 | * This driver is free software; you can redistribute it and/or modify |
| 12 | * it under the terms of the GNU General Public License as published by | 12 | * it under the terms of the GNU General Public License as published by |
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index 810acaa09009..d83e5d0b5d52 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig | |||
| @@ -28,7 +28,7 @@ config SND_SOC_IMX_AUDMUX | |||
| 28 | tristate | 28 | tristate |
| 29 | 29 | ||
| 30 | config SND_MXC_SOC_WM1133_EV1 | 30 | config SND_MXC_SOC_WM1133_EV1 |
| 31 | tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" | 31 | tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted" |
| 32 | depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL | 32 | depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL |
| 33 | select SND_SOC_WM8350 | 33 | select SND_SOC_WM8350 |
| 34 | select SND_MXC_SOC_FIQ | 34 | select SND_MXC_SOC_FIQ |
