diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /drivers | |
parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'drivers')
188 files changed, 284 insertions, 307 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b83389145f28..5d0e26a5c34c 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -52,7 +52,7 @@ config ACPI_PROCFS | |||
52 | depends on PROC_FS | 52 | depends on PROC_FS |
53 | ---help--- | 53 | ---help--- |
54 | For backwards compatibility, this option allows | 54 | For backwards compatibility, this option allows |
55 | depricated /proc/acpi/ files to exist, even when | 55 | deprecated /proc/acpi/ files to exist, even when |
56 | they have been replaced by functions in /sys. | 56 | they have been replaced by functions in /sys. |
57 | The deprecated files (and their replacements) include: | 57 | The deprecated files (and their replacements) include: |
58 | 58 | ||
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 10bc3f64c453..47c806040524 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -1479,7 +1479,7 @@ static void ahci_port_intr(struct ata_port *ap) | |||
1479 | return; | 1479 | return; |
1480 | } | 1480 | } |
1481 | 1481 | ||
1482 | /* hmmm... a spurious interupt */ | 1482 | /* hmmm... a spurious interrupt */ |
1483 | 1483 | ||
1484 | /* if !NCQ, ignore. No modern ATA device has broken HSM | 1484 | /* if !NCQ, ignore. No modern ATA device has broken HSM |
1485 | * implementation for non-NCQ commands. | 1485 | * implementation for non-NCQ commands. |
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index f9e4cd527942..8227c45109ec 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -856,7 +856,7 @@ err_out: | |||
856 | * @pdev: PCI device | 856 | * @pdev: PCI device |
857 | * | 857 | * |
858 | * Some PCI ATA devices report simplex mode but in fact can be told to | 858 | * Some PCI ATA devices report simplex mode but in fact can be told to |
859 | * enter non simplex mode. This implements the neccessary logic to | 859 | * enter non simplex mode. This implements the necessary logic to |
860 | * perform the task on such devices. Calling it on other devices will | 860 | * perform the task on such devices. Calling it on other devices will |
861 | * have -undefined- behaviour. | 861 | * have -undefined- behaviour. |
862 | */ | 862 | */ |
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c index 9e412c26b2a3..7acbbd9ee469 100644 --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c | |||
@@ -215,7 +215,7 @@ static void cmd64x_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
215 | regU &= ~(0x05 << adev->devno); | 215 | regU &= ~(0x05 << adev->devno); |
216 | 216 | ||
217 | if (adev->dma_mode >= XFER_UDMA_0) { | 217 | if (adev->dma_mode >= XFER_UDMA_0) { |
218 | /* Merge thge timing value */ | 218 | /* Merge the timing value */ |
219 | regU |= udma_data[adev->dma_mode - XFER_UDMA_0] << shift; | 219 | regU |= udma_data[adev->dma_mode - XFER_UDMA_0] << shift; |
220 | /* Merge the control bits */ | 220 | /* Merge the control bits */ |
221 | regU |= 1 << adev->devno; /* UDMA on */ | 221 | regU |= 1 << adev->devno; /* UDMA on */ |
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index 57e827e4109e..e1818fdd9159 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c | |||
@@ -138,7 +138,7 @@ static void cs5530_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
138 | * | 138 | * |
139 | * Called when the libata layer is about to issue a command. We wrap | 139 | * Called when the libata layer is about to issue a command. We wrap |
140 | * this interface so that we can load the correct ATA timings if | 140 | * this interface so that we can load the correct ATA timings if |
141 | * neccessary. Specifically we have a problem that there is only | 141 | * necessary. Specifically we have a problem that there is only |
142 | * one MWDMA/UDMA bit. | 142 | * one MWDMA/UDMA bit. |
143 | */ | 143 | */ |
144 | 144 | ||
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c index 3578593a882b..01324530d052 100644 --- a/drivers/ata/pata_cs5535.c +++ b/drivers/ata/pata_cs5535.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * Documentation: | 25 | * Documentation: |
26 | * Available from AMD web site. | 26 | * Available from AMD web site. |
27 | * TODO | 27 | * TODO |
28 | * Review errata to see if serializing is neccessary | 28 | * Review errata to see if serializing is necessary |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 988ef736b936..ca9aae09daed 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
@@ -105,7 +105,7 @@ struct it821x_dev | |||
105 | 105 | ||
106 | /* | 106 | /* |
107 | * We allow users to force the card into non raid mode without | 107 | * We allow users to force the card into non raid mode without |
108 | * flashing the alternative BIOS. This is also neccessary right now | 108 | * flashing the alternative BIOS. This is also necessary right now |
109 | * for embedded platforms that cannot run a PC BIOS but are using this | 109 | * for embedded platforms that cannot run a PC BIOS but are using this |
110 | * device. | 110 | * device. |
111 | */ | 111 | */ |
@@ -383,7 +383,7 @@ static void it821x_passthru_bmdma_stop(struct ata_queued_cmd *qc) | |||
383 | * @ap: ATA port | 383 | * @ap: ATA port |
384 | * @device: Device number (not pointer) | 384 | * @device: Device number (not pointer) |
385 | * | 385 | * |
386 | * Device selection hook. If neccessary perform clock switching | 386 | * Device selection hook. If necessary perform clock switching |
387 | */ | 387 | */ |
388 | 388 | ||
389 | static void it821x_passthru_dev_select(struct ata_port *ap, | 389 | static void it821x_passthru_dev_select(struct ata_port *ap, |
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c index d5483087a3fa..c0d9e0cf208c 100644 --- a/drivers/ata/pata_mpiix.c +++ b/drivers/ata/pata_mpiix.c | |||
@@ -129,7 +129,7 @@ static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
129 | * | 129 | * |
130 | * Called when the libata layer is about to issue a command. We wrap | 130 | * Called when the libata layer is about to issue a command. We wrap |
131 | * this interface so that we can load the correct ATA timings if | 131 | * this interface so that we can load the correct ATA timings if |
132 | * neccessary. Our logic also clears TIME0/TIME1 for the other device so | 132 | * necessary. Our logic also clears TIME0/TIME1 for the other device so |
133 | * that, even if we get this wrong, cycles to the other device will | 133 | * that, even if we get this wrong, cycles to the other device will |
134 | * be made PIO0. | 134 | * be made PIO0. |
135 | */ | 135 | */ |
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c index 6e8e55745b7b..9fe66fd75017 100644 --- a/drivers/ata/pata_ns87410.c +++ b/drivers/ata/pata_ns87410.c | |||
@@ -124,7 +124,7 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
124 | * | 124 | * |
125 | * Called when the libata layer is about to issue a command. We wrap | 125 | * Called when the libata layer is about to issue a command. We wrap |
126 | * this interface so that we can load the correct ATA timings if | 126 | * this interface so that we can load the correct ATA timings if |
127 | * neccessary. | 127 | * necessary. |
128 | */ | 128 | */ |
129 | 129 | ||
130 | static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc) | 130 | static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc) |
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c index 3cd5eb2b6c91..44da09ace52c 100644 --- a/drivers/ata/pata_oldpiix.c +++ b/drivers/ata/pata_oldpiix.c | |||
@@ -200,7 +200,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
200 | * | 200 | * |
201 | * Called when the libata layer is about to issue a command. We wrap | 201 | * Called when the libata layer is about to issue a command. We wrap |
202 | * this interface so that we can load the correct ATA timings if | 202 | * this interface so that we can load the correct ATA timings if |
203 | * neccessary. Our logic also clears TIME0/TIME1 for the other device so | 203 | * necessary. Our logic also clears TIME0/TIME1 for the other device so |
204 | * that, even if we get this wrong, cycles to the other device will | 204 | * that, even if we get this wrong, cycles to the other device will |
205 | * be made PIO0. | 205 | * be made PIO0. |
206 | */ | 206 | */ |
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c index d5b76497f4a2..8109b08fc024 100644 --- a/drivers/ata/pata_radisys.c +++ b/drivers/ata/pata_radisys.c | |||
@@ -161,7 +161,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
161 | * | 161 | * |
162 | * Called when the libata layer is about to issue a command. We wrap | 162 | * Called when the libata layer is about to issue a command. We wrap |
163 | * this interface so that we can load the correct ATA timings if | 163 | * this interface so that we can load the correct ATA timings if |
164 | * neccessary. Our logic also clears TIME0/TIME1 for the other device so | 164 | * necessary. Our logic also clears TIME0/TIME1 for the other device so |
165 | * that, even if we get this wrong, cycles to the other device will | 165 | * that, even if we get this wrong, cycles to the other device will |
166 | * be made PIO0. | 166 | * be made PIO0. |
167 | */ | 167 | */ |
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index 21ebc485ca4b..725a8586cd6e 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c | |||
@@ -156,7 +156,7 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
156 | * | 156 | * |
157 | * Called when the libata layer is about to issue a command. We wrap | 157 | * Called when the libata layer is about to issue a command. We wrap |
158 | * this interface so that we can load the correct ATA timings if | 158 | * this interface so that we can load the correct ATA timings if |
159 | * neccessary. Specifically we have a problem that there is only | 159 | * necessary. Specifically we have a problem that there is only |
160 | * one MWDMA/UDMA bit. | 160 | * one MWDMA/UDMA bit. |
161 | */ | 161 | */ |
162 | 162 | ||
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index 4dc2e73298fd..5c1e9cb59ecb 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * | 16 | * |
17 | * If you have strange problems with nVidia chipset systems please | 17 | * If you have strange problems with nVidia chipset systems please |
18 | * see the SI support documentation and update your system BIOS | 18 | * see the SI support documentation and update your system BIOS |
19 | * if neccessary | 19 | * if necessary |
20 | * | 20 | * |
21 | * TODO | 21 | * TODO |
22 | * If we know all our devices are LBA28 (or LBA28 sized) we could use | 22 | * If we know all our devices are LBA28 (or LBA28 sized) we could use |
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 5d41b6612d7f..ea7a9a652e61 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
@@ -420,7 +420,7 @@ static struct ata_port_operations via_port_ops_noirq = { | |||
420 | * @pdev: PCI device | 420 | * @pdev: PCI device |
421 | * @flags: configuration flags | 421 | * @flags: configuration flags |
422 | * | 422 | * |
423 | * Set the FIFO properties for this device if neccessary. Used both on | 423 | * Set the FIFO properties for this device if necessary. Used both on |
424 | * set up and on and the resume path | 424 | * set up and on and the resume path |
425 | */ | 425 | */ |
426 | 426 | ||
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 94ebc9dc40fd..f8f7139c07c1 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
@@ -1596,7 +1596,7 @@ static irqreturn_t fs_irq (int irq, void *dev_id) | |||
1596 | 1596 | ||
1597 | /* print the bits in the ISR register. */ | 1597 | /* print the bits in the ISR register. */ |
1598 | if (fs_debug & FS_DEBUG_IRQ) { | 1598 | if (fs_debug & FS_DEBUG_IRQ) { |
1599 | /* The FS_DEBUG things are unneccesary here. But this way it is | 1599 | /* The FS_DEBUG things are unnecessary here. But this way it is |
1600 | clear for grep that these are debug prints. */ | 1600 | clear for grep that these are debug prints. */ |
1601 | fs_dprintk (FS_DEBUG_IRQ, "IRQ status:"); | 1601 | fs_dprintk (FS_DEBUG_IRQ, "IRQ status:"); |
1602 | for (i=0;i<27;i++) | 1602 | for (i=0;i<27;i++) |
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index ca4d7f0d09b7..ce4b1e484e64 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig | |||
@@ -204,23 +204,6 @@ config BLK_DEV_COW_COMMON | |||
204 | bool | 204 | bool |
205 | default BLK_DEV_UBD | 205 | default BLK_DEV_UBD |
206 | 206 | ||
207 | config MMAPPER | ||
208 | tristate "Example IO memory driver (BROKEN)" | ||
209 | depends on UML && BROKEN | ||
210 | ---help--- | ||
211 | The User-Mode Linux port can provide support for IO Memory | ||
212 | emulation with this option. This allows a host file to be | ||
213 | specified as an I/O region on the kernel command line. That file | ||
214 | will be mapped into UML's kernel address space where a driver can | ||
215 | locate it and do whatever it wants with the memory, including | ||
216 | providing an interface to it for UML processes to use. | ||
217 | |||
218 | For more information, see | ||
219 | <http://user-mode-linux.sourceforge.net/iomem.html>. | ||
220 | |||
221 | If you'd like to be able to provide a simulated IO port space for | ||
222 | User-Mode Linux processes, say Y. If unsure, say N. | ||
223 | |||
224 | config BLK_DEV_LOOP | 207 | config BLK_DEV_LOOP |
225 | tristate "Loopback device support" | 208 | tristate "Loopback device support" |
226 | ---help--- | 209 | ---help--- |
@@ -351,7 +334,7 @@ config BLK_DEV_RAM_COUNT | |||
351 | default "16" | 334 | default "16" |
352 | depends on BLK_DEV_RAM | 335 | depends on BLK_DEV_RAM |
353 | help | 336 | help |
354 | The default value is 16 RAM disks. Change this if you know what | 337 | The default value is 16 RAM disks. Change this if you know what you |
355 | are doing. If you boot from a filesystem that needs to be extracted | 338 | are doing. If you boot from a filesystem that needs to be extracted |
356 | in memory, you will need at least one RAM disk (e.g. root on cramfs). | 339 | in memory, you will need at least one RAM disk (e.g. root on cramfs). |
357 | 340 | ||
@@ -361,7 +344,7 @@ config BLK_DEV_RAM_SIZE | |||
361 | default "4096" | 344 | default "4096" |
362 | help | 345 | help |
363 | The default value is 4096 kilobytes. Only change this if you know | 346 | The default value is 4096 kilobytes. Only change this if you know |
364 | what are you doing. | 347 | what you are doing. |
365 | 348 | ||
366 | config BLK_DEV_RAM_BLOCKSIZE | 349 | config BLK_DEV_RAM_BLOCKSIZE |
367 | int "Default RAM disk block size (bytes)" | 350 | int "Default RAM disk block size (bytes)" |
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 589cbbd9cd4f..56e23042728a 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
@@ -29,7 +29,7 @@ | |||
29 | * | 29 | * |
30 | * Maximum number of loop devices when compiled-in now selectable by passing | 30 | * Maximum number of loop devices when compiled-in now selectable by passing |
31 | * max_loop=<1-255> to the kernel on boot. | 31 | * max_loop=<1-255> to the kernel on boot. |
32 | * Erik I. Bolsø, <eriki@himolde.no>, Oct 31, 1999 | 32 | * Erik I. Bolsø, <eriki@himolde.no>, Oct 31, 1999 |
33 | * | 33 | * |
34 | * Completely rewrite request handling to be make_request_fn style and | 34 | * Completely rewrite request handling to be make_request_fn style and |
35 | * non blocking, pushing work to a helper thread. Lots of fixes from | 35 | * non blocking, pushing work to a helper thread. Lots of fixes from |
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index ac4a0cb217ab..6332acad078c 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
@@ -508,7 +508,6 @@ error_out: | |||
508 | nbd_end_request(req); | 508 | nbd_end_request(req); |
509 | spin_lock(q->queue_lock); | 509 | spin_lock(q->queue_lock); |
510 | } | 510 | } |
511 | return; | ||
512 | } | 511 | } |
513 | 512 | ||
514 | static int nbd_ioctl(struct inode *inode, struct file *file, | 513 | static int nbd_ioctl(struct inode *inode, struct file *file, |
diff --git a/drivers/block/rd.c b/drivers/block/rd.c index 08176d23a46c..47f8ac6cce57 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c | |||
@@ -365,7 +365,7 @@ static int rd_open(struct inode *inode, struct file *filp) | |||
365 | /* | 365 | /* |
366 | * Deep badness. rd_blkdev_pagecache_IO() needs to allocate | 366 | * Deep badness. rd_blkdev_pagecache_IO() needs to allocate |
367 | * pagecache pages within a request_fn. We cannot recur back | 367 | * pagecache pages within a request_fn. We cannot recur back |
368 | * into the filesytem which is mounted atop the ramdisk, because | 368 | * into the filesystem which is mounted atop the ramdisk, because |
369 | * that would deadlock on fs locks. And we really don't want | 369 | * that would deadlock on fs locks. And we really don't want |
370 | * to reenter rd_blkdev_pagecache_IO when we're already within | 370 | * to reenter rd_blkdev_pagecache_IO when we're already within |
371 | * that function. | 371 | * that function. |
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index d15234c5965e..d1bd0f08a331 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
@@ -359,7 +359,7 @@ | |||
359 | * | 359 | * |
360 | * Revision 1.36.3.8 1996/06/07 16:29:00 bentson | 360 | * Revision 1.36.3.8 1996/06/07 16:29:00 bentson |
361 | * starting minor number at zero; added missing verify_area | 361 | * starting minor number at zero; added missing verify_area |
362 | * as noted by Heiko Eissfeldt <heiko@colossus.escape.de> | 362 | * as noted by Heiko Eißfeldt <heiko@colossus.escape.de> |
363 | * | 363 | * |
364 | * Revision 1.36.3.7 1996/04/19 21:06:18 bentson | 364 | * Revision 1.36.3.7 1996/04/19 21:06:18 bentson |
365 | * remove unneeded boot message & fix CLOCAL hardware flow | 365 | * remove unneeded boot message & fix CLOCAL hardware flow |
@@ -727,8 +727,6 @@ static struct tty_driver *cy_serial_driver; | |||
727 | driver to probe addresses at a different address, add it to | 727 | driver to probe addresses at a different address, add it to |
728 | this table. If the driver is probing some other board and | 728 | this table. If the driver is probing some other board and |
729 | causing problems, remove the offending address from this table. | 729 | causing problems, remove the offending address from this table. |
730 | The cy_setup function extracts additional addresses from the | ||
731 | boot options line. The form is "cyclades=address,address..." | ||
732 | */ | 730 | */ |
733 | 731 | ||
734 | static unsigned int cy_isa_addresses[] = { | 732 | static unsigned int cy_isa_addresses[] = { |
diff --git a/drivers/char/drm/drm_hashtab.c b/drivers/char/drm/drm_hashtab.c index 3ad319070704..4b8e7db5a232 100644 --- a/drivers/char/drm/drm_hashtab.c +++ b/drivers/char/drm/drm_hashtab.c | |||
@@ -29,7 +29,7 @@ | |||
29 | * Simple open hash tab implementation. | 29 | * Simple open hash tab implementation. |
30 | * | 30 | * |
31 | * Authors: | 31 | * Authors: |
32 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 32 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "drmP.h" | 35 | #include "drmP.h" |
diff --git a/drivers/char/drm/drm_hashtab.h b/drivers/char/drm/drm_hashtab.h index 0f1376774168..573e333ac457 100644 --- a/drivers/char/drm/drm_hashtab.h +++ b/drivers/char/drm/drm_hashtab.h | |||
@@ -29,7 +29,7 @@ | |||
29 | * Simple open hash tab implementation. | 29 | * Simple open hash tab implementation. |
30 | * | 30 | * |
31 | * Authors: | 31 | * Authors: |
32 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 32 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #ifndef DRM_HASHTAB_H | 35 | #ifndef DRM_HASHTAB_H |
diff --git a/drivers/char/drm/drm_mm.c b/drivers/char/drm/drm_mm.c index 3e6bc14f7441..86f4eb61a6a4 100644 --- a/drivers/char/drm/drm_mm.c +++ b/drivers/char/drm/drm_mm.c | |||
@@ -38,7 +38,7 @@ | |||
38 | * Aligned allocations can also see improvement. | 38 | * Aligned allocations can also see improvement. |
39 | * | 39 | * |
40 | * Authors: | 40 | * Authors: |
41 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 41 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "drmP.h" | 44 | #include "drmP.h" |
diff --git a/drivers/char/drm/drm_pci.c b/drivers/char/drm/drm_pci.c index e292bb0eaca2..b55d5bc6ea61 100644 --- a/drivers/char/drm/drm_pci.c +++ b/drivers/char/drm/drm_pci.c | |||
@@ -8,12 +8,12 @@ | |||
8 | * \todo Implement the remaining ioctl's for the PCI pools. | 8 | * \todo Implement the remaining ioctl's for the PCI pools. |
9 | * \todo The wrappers here are so thin that they would be better off inlined.. | 9 | * \todo The wrappers here are so thin that they would be better off inlined.. |
10 | * | 10 | * |
11 | * \author Jose Fonseca <jrfonseca@tungstengraphics.com> | 11 | * \author José Fonseca <jrfonseca@tungstengraphics.com> |
12 | * \author Leif Delgass <ldelgass@retinalburn.net> | 12 | * \author Leif Delgass <ldelgass@retinalburn.net> |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* | 15 | /* |
16 | * Copyright 2003 Jos�Fonseca. | 16 | * Copyright 2003 José Fonseca. |
17 | * Copyright 2003 Leif Delgass. | 17 | * Copyright 2003 Leif Delgass. |
18 | * All Rights Reserved. | 18 | * All Rights Reserved. |
19 | * | 19 | * |
diff --git a/drivers/char/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h index f5466966081e..e040f47f369f 100644 --- a/drivers/char/drm/drm_sarea.h +++ b/drivers/char/drm/drm_sarea.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * \file drm_sarea.h | 2 | * \file drm_sarea.h |
3 | * \brief SAREA definitions | 3 | * \brief SAREA definitions |
4 | * | 4 | * |
5 | * \author Michel Dänzer <michel@daenzer.net> | 5 | * \author Michel Dänzer <michel@daenzer.net> |
6 | */ | 6 | */ |
7 | 7 | ||
8 | /* | 8 | /* |
diff --git a/drivers/char/drm/drm_sman.c b/drivers/char/drm/drm_sman.c index 8421a93946d8..926f146390ce 100644 --- a/drivers/char/drm/drm_sman.c +++ b/drivers/char/drm/drm_sman.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * struct or a context identifier. | 33 | * struct or a context identifier. |
34 | * | 34 | * |
35 | * Authors: | 35 | * Authors: |
36 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 36 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "drm_sman.h" | 39 | #include "drm_sman.h" |
diff --git a/drivers/char/drm/drm_sman.h b/drivers/char/drm/drm_sman.h index 39a39fefeef1..08ecf83ad5d4 100644 --- a/drivers/char/drm/drm_sman.h +++ b/drivers/char/drm/drm_sman.h | |||
@@ -33,7 +33,7 @@ | |||
33 | * struct or a context identifier. | 33 | * struct or a context identifier. |
34 | * | 34 | * |
35 | * Authors: | 35 | * Authors: |
36 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 36 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #ifndef DRM_SMAN_H | 39 | #ifndef DRM_SMAN_H |
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h index 250d2aa46581..5041bd8dbed8 100644 --- a/drivers/char/drm/r128_drv.h +++ b/drivers/char/drm/r128_drv.h | |||
@@ -29,7 +29,7 @@ | |||
29 | * Rickard E. (Rik) Faith <faith@valinux.com> | 29 | * Rickard E. (Rik) Faith <faith@valinux.com> |
30 | * Kevin E. Martin <martin@valinux.com> | 30 | * Kevin E. Martin <martin@valinux.com> |
31 | * Gareth Hughes <gareth@valinux.com> | 31 | * Gareth Hughes <gareth@valinux.com> |
32 | * Michel D�zer <daenzerm@student.ethz.ch> | 32 | * Michel Dänzer <daenzerm@student.ethz.ch> |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #ifndef __R128_DRV_H__ | 35 | #ifndef __R128_DRV_H__ |
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c index 2b2407ee490e..84f5bc36252b 100644 --- a/drivers/char/drm/radeon_irq.c +++ b/drivers/char/drm/radeon_irq.c | |||
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * Authors: | 28 | * Authors: |
29 | * Keith Whitwell <keith@tungstengraphics.com> | 29 | * Keith Whitwell <keith@tungstengraphics.com> |
30 | * Michel D�zer <michel@daenzer.net> | 30 | * Michel Dänzer <michel@daenzer.net> |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "drmP.h" | 33 | #include "drmP.h" |
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c index 69c9f2febf43..f824f2f5fdc2 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/char/drm/radeon_state.c | |||
@@ -3005,7 +3005,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil | |||
3005 | /* | 3005 | /* |
3006 | * This ioctl() doesn't work on 64-bit platforms because hw_lock is a | 3006 | * This ioctl() doesn't work on 64-bit platforms because hw_lock is a |
3007 | * pointer which can't fit into an int-sized variable. According to | 3007 | * pointer which can't fit into an int-sized variable. According to |
3008 | * Michel Dänzer, the ioctl() is only used on embedded platforms, so | 3008 | * Michel Dänzer, the ioctl() is only used on embedded platforms, so |
3009 | * not supporting it shouldn't be a problem. If the same functionality | 3009 | * not supporting it shouldn't be a problem. If the same functionality |
3010 | * is needed on 64-bit platforms, a new ioctl() would have to be added, | 3010 | * is needed on 64-bit platforms, a new ioctl() would have to be added, |
3011 | * so backwards-compatibility for the embedded platforms can be | 3011 | * so backwards-compatibility for the embedded platforms can be |
diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c index 8c66838ff515..6be1c5757580 100644 --- a/drivers/char/drm/sis_mm.c +++ b/drivers/char/drm/sis_mm.c | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Authors: | 30 | * Authors: |
31 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 31 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include "drmP.h" |
diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c index 9afc1684348d..3ffbf8649833 100644 --- a/drivers/char/drm/via_mm.c +++ b/drivers/char/drm/via_mm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | /* | 24 | /* |
25 | * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 25 | * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include "drmP.h" |
diff --git a/drivers/char/drm/via_verifier.h b/drivers/char/drm/via_verifier.h index 28b50296a7bd..d6f8214b69f5 100644 --- a/drivers/char/drm/via_verifier.h +++ b/drivers/char/drm/via_verifier.h | |||
@@ -20,7 +20,7 @@ | |||
20 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | * DEALINGS IN THE SOFTWARE. | 21 | * DEALINGS IN THE SOFTWARE. |
22 | * | 22 | * |
23 | * Author: Thomas Hellström 2004. | 23 | * Author: Thomas Hellström 2004. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #ifndef _VIA_VERIFIER_H_ | 26 | #ifndef _VIA_VERIFIER_H_ |
diff --git a/drivers/char/esp.c b/drivers/char/esp.c index 0f8fb135da53..28607763ae64 100644 --- a/drivers/char/esp.c +++ b/drivers/char/esp.c | |||
@@ -19,7 +19,7 @@ | |||
19 | * | 19 | * |
20 | * rs_set_termios fixed to look also for changes of the input | 20 | * rs_set_termios fixed to look also for changes of the input |
21 | * flags INPCK, BRKINT, PARMRK, IGNPAR and IGNBRK. | 21 | * flags INPCK, BRKINT, PARMRK, IGNPAR and IGNBRK. |
22 | * Bernd Anh�pl 05/17/96. | 22 | * Bernd Anhäupl 05/17/96. |
23 | * | 23 | * |
24 | * --- End of notices from serial.c --- | 24 | * --- End of notices from serial.c --- |
25 | * | 25 | * |
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c index e13dd1892bfd..3f35a1c562b1 100644 --- a/drivers/char/hw_random/omap-rng.c +++ b/drivers/char/hw_random/omap-rng.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Mostly based on original driver: | 10 | * Mostly based on original driver: |
11 | * | 11 | * |
12 | * Copyright (C) 2005 Nokia Corporation | 12 | * Copyright (C) 2005 Nokia Corporation |
13 | * Author: Juha Yrj��<juha.yrjola@nokia.com> | 13 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> |
14 | * | 14 | * |
15 | * This file is licensed under the terms of the GNU General Public | 15 | * This file is licensed under the terms of the GNU General Public |
16 | * License version 2. This program is licensed "as is" without any | 16 | * License version 2. This program is licensed "as is" without any |
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index cd406416effd..30e564516422 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c | |||
@@ -371,14 +371,14 @@ static int i8k_proc_show(struct seq_file *seq, void *offset) | |||
371 | int fn_key, cpu_temp, ac_power; | 371 | int fn_key, cpu_temp, ac_power; |
372 | int left_fan, right_fan, left_speed, right_speed; | 372 | int left_fan, right_fan, left_speed, right_speed; |
373 | 373 | ||
374 | cpu_temp = i8k_get_temp(0); /* 11100 µs */ | 374 | cpu_temp = i8k_get_temp(0); /* 11100 µs */ |
375 | left_fan = i8k_get_fan_status(I8K_FAN_LEFT); /* 580 µs */ | 375 | left_fan = i8k_get_fan_status(I8K_FAN_LEFT); /* 580 µs */ |
376 | right_fan = i8k_get_fan_status(I8K_FAN_RIGHT); /* 580 µs */ | 376 | right_fan = i8k_get_fan_status(I8K_FAN_RIGHT); /* 580 µs */ |
377 | left_speed = i8k_get_fan_speed(I8K_FAN_LEFT); /* 580 µs */ | 377 | left_speed = i8k_get_fan_speed(I8K_FAN_LEFT); /* 580 µs */ |
378 | right_speed = i8k_get_fan_speed(I8K_FAN_RIGHT); /* 580 µs */ | 378 | right_speed = i8k_get_fan_speed(I8K_FAN_RIGHT); /* 580 µs */ |
379 | fn_key = i8k_get_fn_status(); /* 750 µs */ | 379 | fn_key = i8k_get_fn_status(); /* 750 µs */ |
380 | if (power_status) | 380 | if (power_status) |
381 | ac_power = i8k_get_power_status(); /* 14700 µs */ | 381 | ac_power = i8k_get_power_status(); /* 14700 µs */ |
382 | else | 382 | else |
383 | ac_power = -1; | 383 | ac_power = -1; |
384 | 384 | ||
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index 038056911934..596c7173997b 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c | |||
@@ -437,7 +437,7 @@ static inline void finish_erasing(struct tty_struct *tty) | |||
437 | * @c: character input | 437 | * @c: character input |
438 | * @tty: terminal device | 438 | * @tty: terminal device |
439 | * | 439 | * |
440 | * Perform erase and neccessary output when an erase character is | 440 | * Perform erase and necessary output when an erase character is |
441 | * present in the stream from the driver layer. Handles the complexities | 441 | * present in the stream from the driver layer. Handles the complexities |
442 | * of UTF-8 multibyte symbols. | 442 | * of UTF-8 multibyte symbols. |
443 | */ | 443 | */ |
@@ -657,7 +657,7 @@ static inline void n_tty_receive_overrun(struct tty_struct *tty) | |||
657 | * @c: character | 657 | * @c: character |
658 | * | 658 | * |
659 | * Process a parity error and queue the right data to indicate | 659 | * Process a parity error and queue the right data to indicate |
660 | * the error case if neccessary. Locking as per n_tty_receive_buf. | 660 | * the error case if necessary. Locking as per n_tty_receive_buf. |
661 | */ | 661 | */ |
662 | static inline void n_tty_receive_parity_error(struct tty_struct *tty, | 662 | static inline void n_tty_receive_parity_error(struct tty_struct *tty, |
663 | unsigned char c) | 663 | unsigned char c) |
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 7e6a3a413bb2..d83419c3857e 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c | |||
@@ -563,7 +563,7 @@ static void rp_do_poll(unsigned long dummy) | |||
563 | /* Get a ptr to the board's control struct */ | 563 | /* Get a ptr to the board's control struct */ |
564 | ctlp = sCtlNumToCtlPtr(ctrl); | 564 | ctlp = sCtlNumToCtlPtr(ctrl); |
565 | 565 | ||
566 | /* Get the interupt status from the board */ | 566 | /* Get the interrupt status from the board */ |
567 | #ifdef CONFIG_PCI | 567 | #ifdef CONFIG_PCI |
568 | if (ctlp->BusType == isPCI) | 568 | if (ctlp->BusType == isPCI) |
569 | CtlMask = sPCIGetControllerIntStatus(ctlp); | 569 | CtlMask = sPCIGetControllerIntStatus(ctlp); |
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index 9782cb4d30dc..877e53dcb996 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> | 8 | * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> |
9 | * | 9 | * |
10 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 10 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
11 | * | 11 | * |
12 | * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> | 12 | * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> |
13 | * | 13 | * |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 13a53575a016..f36fecd3fd26 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -943,7 +943,7 @@ EXPORT_SYMBOL_GPL(tty_ldisc_deref); | |||
943 | * @tty: terminal to activate ldisc on | 943 | * @tty: terminal to activate ldisc on |
944 | * | 944 | * |
945 | * Set the TTY_LDISC flag when the line discipline can be called | 945 | * Set the TTY_LDISC flag when the line discipline can be called |
946 | * again. Do neccessary wakeups for existing sleepers. | 946 | * again. Do necessary wakeups for existing sleepers. |
947 | * | 947 | * |
948 | * Note: nobody should set this bit except via this function. Clearing | 948 | * Note: nobody should set this bit except via this function. Clearing |
949 | * directly is allowed. | 949 | * directly is allowed. |
@@ -1504,7 +1504,7 @@ EXPORT_SYMBOL(tty_hangup); | |||
1504 | * | 1504 | * |
1505 | * The user has asked via system call for the terminal to be hung up. | 1505 | * The user has asked via system call for the terminal to be hung up. |
1506 | * We do this synchronously so that when the syscall returns the process | 1506 | * We do this synchronously so that when the syscall returns the process |
1507 | * is complete. That guarantee is neccessary for security reasons. | 1507 | * is complete. That guarantee is necessary for security reasons. |
1508 | */ | 1508 | */ |
1509 | 1509 | ||
1510 | void tty_vhangup(struct tty_struct * tty) | 1510 | void tty_vhangup(struct tty_struct * tty) |
@@ -1691,7 +1691,7 @@ EXPORT_SYMBOL(stop_tty); | |||
1691 | * @tty: tty to start | 1691 | * @tty: tty to start |
1692 | * | 1692 | * |
1693 | * Start a tty that has been stopped if at all possible. Perform | 1693 | * Start a tty that has been stopped if at all possible. Perform |
1694 | * any neccessary wakeups and propagate the TIOCPKT status. If this | 1694 | * any necessary wakeups and propagate the TIOCPKT status. If this |
1695 | * is the tty was previous stopped and is being started then the | 1695 | * is the tty was previous stopped and is being started then the |
1696 | * driver start method is invoked and the line discipline woken. | 1696 | * driver start method is invoked and the line discipline woken. |
1697 | * | 1697 | * |
@@ -2877,7 +2877,7 @@ static int tty_fasync(int fd, struct file * filp, int on) | |||
2877 | * @tty: tty to fake input into | 2877 | * @tty: tty to fake input into |
2878 | * @p: pointer to character | 2878 | * @p: pointer to character |
2879 | * | 2879 | * |
2880 | * Fake input to a tty device. Does the neccessary locking and | 2880 | * Fake input to a tty device. Does the necessary locking and |
2881 | * input management. | 2881 | * input management. |
2882 | * | 2882 | * |
2883 | * FIXME: does not honour flow control ?? | 2883 | * FIXME: does not honour flow control ?? |
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index 0def089cc1f2..7a003504c265 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
@@ -444,7 +444,7 @@ static void change_termios(struct tty_struct * tty, struct ktermios * new_termio | |||
444 | * @arg: user data | 444 | * @arg: user data |
445 | * @opt: option information | 445 | * @opt: option information |
446 | * | 446 | * |
447 | * Helper function to prepare termios data and run neccessary other | 447 | * Helper function to prepare termios data and run necessary other |
448 | * functions before using change_termios to do the actual changes. | 448 | * functions before using change_termios to do the actual changes. |
449 | * | 449 | * |
450 | * Locking: | 450 | * Locking: |
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c index 9959b799dbe2..c00d4a9b39e5 100644 --- a/drivers/firewire/fw-transaction.c +++ b/drivers/firewire/fw-transaction.c | |||
@@ -228,7 +228,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel, | |||
228 | * | 228 | * |
229 | * @param card the card from which to send the request | 229 | * @param card the card from which to send the request |
230 | * @param tcode the tcode for this transaction. Do not use | 230 | * @param tcode the tcode for this transaction. Do not use |
231 | * TCODE_LOCK_REQUEST directly, insted use TCODE_LOCK_MASK_SWAP | 231 | * TCODE_LOCK_REQUEST directly, instead use TCODE_LOCK_MASK_SWAP |
232 | * etc. to specify tcode and ext_tcode. | 232 | * etc. to specify tcode and ext_tcode. |
233 | * @param node_id the destination node ID (bus ID and PHY ID concatenated) | 233 | * @param node_id the destination node ID (bus ID and PHY ID concatenated) |
234 | * @param generation the generation for which node_id is valid | 234 | * @param generation the generation for which node_id is valid |
diff --git a/drivers/hid/usbhid/hid-ff.c b/drivers/hid/usbhid/hid-ff.c index 22329feb3b5a..4c210e16b1b4 100644 --- a/drivers/hid/usbhid/hid-ff.c +++ b/drivers/hid/usbhid/hid-ff.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: hid-ff.c,v 1.2 2002/04/18 22:02:47 jdeneux Exp $ | ||
3 | * | ||
4 | * Force feedback support for hid devices. | 2 | * Force feedback support for hid devices. |
5 | * Not all hid devices use the same protocol. For example, some use PID, | 3 | * Not all hid devices use the same protocol. For example, some use PID, |
6 | * other use their own proprietary procotol. | 4 | * other use their own proprietary procotol. |
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c index a3b56c816e11..2d39d8fc2389 100644 --- a/drivers/hwmon/gl520sm.c +++ b/drivers/hwmon/gl520sm.c | |||
@@ -2,7 +2,7 @@ | |||
2 | gl520sm.c - Part of lm_sensors, Linux kernel modules for hardware | 2 | gl520sm.c - Part of lm_sensors, Linux kernel modules for hardware |
3 | monitoring | 3 | monitoring |
4 | Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>, | 4 | Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>, |
5 | Kyösti Mälkki <kmalkki@cc.hut.fi> | 5 | Kyösti Mälkki <kmalkki@cc.hut.fi> |
6 | Copyright (c) 2005 Maarten Deprez <maartendeprez@users.sourceforge.net> | 6 | Copyright (c) 2005 Maarten Deprez <maartendeprez@users.sourceforge.net> |
7 | 7 | ||
8 | This program is free software; you can redistribute it and/or modify | 8 | This program is free software; you can redistribute it and/or modify |
@@ -805,7 +805,7 @@ static void __exit sensors_gl520sm_exit(void) | |||
805 | 805 | ||
806 | 806 | ||
807 | MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, " | 807 | MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, " |
808 | "Kyösti Mälkki <kmalkki@cc.hut.fi>, " | 808 | "Kyösti Mälkki <kmalkki@cc.hut.fi>, " |
809 | "Maarten Deprez <maartendeprez@users.sourceforge.net>"); | 809 | "Maarten Deprez <maartendeprez@users.sourceforge.net>"); |
810 | MODULE_DESCRIPTION("GL520SM driver"); | 810 | MODULE_DESCRIPTION("GL520SM driver"); |
811 | MODULE_LICENSE("GPL"); | 811 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index 860b71ccbb86..7e2d9787babc 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c | |||
@@ -3,7 +3,7 @@ | |||
3 | for hardware monitoring | 3 | for hardware monitoring |
4 | 4 | ||
5 | Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>, | 5 | Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>, |
6 | Kyösti Mälkki <kmalkki@cc.hut.fi>, and | 6 | Kyösti Mälkki <kmalkki@cc.hut.fi>, and |
7 | Mark D. Studebaker <mdsxyz123@yahoo.com> | 7 | Mark D. Studebaker <mdsxyz123@yahoo.com> |
8 | Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with | 8 | Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with |
9 | the help of Jean Delvare <khali@linux-fr.org> | 9 | the help of Jean Delvare <khali@linux-fr.org> |
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c index 8f63dada6019..2635bba1e3fc 100644 --- a/drivers/hwmon/via686a.c +++ b/drivers/hwmon/via686a.c | |||
@@ -3,7 +3,7 @@ | |||
3 | for hardware monitoring | 3 | for hardware monitoring |
4 | 4 | ||
5 | Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, | 5 | Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, |
6 | Kyösti Mälkki <kmalkki@cc.hut.fi>, | 6 | Kyösti Mälkki <kmalkki@cc.hut.fi>, |
7 | Mark Studebaker <mdsxyz123@yahoo.com>, | 7 | Mark Studebaker <mdsxyz123@yahoo.com>, |
8 | and Bob Dougherty <bobd@stanford.edu> | 8 | and Bob Dougherty <bobd@stanford.edu> |
9 | (Some conversion-factor data were contributed by Jonathan Teh Soon Yew | 9 | (Some conversion-factor data were contributed by Jonathan Teh Soon Yew |
@@ -866,7 +866,7 @@ static void __exit sm_via686a_exit(void) | |||
866 | } | 866 | } |
867 | } | 867 | } |
868 | 868 | ||
869 | MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>, " | 869 | MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>, " |
870 | "Mark Studebaker <mdsxyz123@yahoo.com> " | 870 | "Mark Studebaker <mdsxyz123@yahoo.com> " |
871 | "and Bob Dougherty <bobd@stanford.edu>"); | 871 | "and Bob Dougherty <bobd@stanford.edu>"); |
872 | MODULE_DESCRIPTION("VIA 686A Sensor device"); | 872 | MODULE_DESCRIPTION("VIA 686A Sensor device"); |
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index 7f0a0a62cf60..a37cb6b8593c 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c | |||
@@ -18,7 +18,7 @@ | |||
18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ | 18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ |
19 | /* ------------------------------------------------------------------------- */ | 19 | /* ------------------------------------------------------------------------- */ |
20 | 20 | ||
21 | /* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki | 21 | /* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki |
22 | <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */ | 22 | <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */ |
23 | 23 | ||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index 36fdf971f080..2a16211f12e5 100644 --- a/drivers/i2c/algos/i2c-algo-pca.c +++ b/drivers/i2c/algos/i2c-algo-pca.c | |||
@@ -350,7 +350,7 @@ static int pca_init(struct i2c_algo_pca_data *adap) | |||
350 | pca_outw(adap, I2C_PCA_ADR, own << 1); | 350 | pca_outw(adap, I2C_PCA_ADR, own << 1); |
351 | 351 | ||
352 | pca_set_con(adap, I2C_PCA_CON_ENSIO | clock); | 352 | pca_set_con(adap, I2C_PCA_CON_ENSIO | clock); |
353 | udelay(500); /* 500 µs for oscilator to stabilise */ | 353 | udelay(500); /* 500 µs for oscilator to stabilise */ |
354 | 354 | ||
355 | return 0; | 355 | return 0; |
356 | } | 356 | } |
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index ecb2c2d7d540..ab2e6f3498b4 100644 --- a/drivers/i2c/algos/i2c-algo-pcf.c +++ b/drivers/i2c/algos/i2c-algo-pcf.c | |||
@@ -19,7 +19,7 @@ | |||
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ | 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ |
20 | /* ------------------------------------------------------------------------- */ | 20 | /* ------------------------------------------------------------------------- */ |
21 | 21 | ||
22 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and | 22 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and |
23 | Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey | 23 | Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey |
24 | <mbailey@littlefeet-inc.com> */ | 24 | <mbailey@littlefeet-inc.com> */ |
25 | 25 | ||
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index de95c75efb41..c466c6cfc2e5 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -278,7 +278,7 @@ config I2C_IXP2000 | |||
278 | depends on ARCH_IXP2000 | 278 | depends on ARCH_IXP2000 |
279 | select I2C_ALGOBIT | 279 | select I2C_ALGOBIT |
280 | help | 280 | help |
281 | Say Y here if you have an Intel IXP2000(2400, 2800, 2850) based | 281 | Say Y here if you have an Intel IXP2000 (2400, 2800, 2850) based |
282 | system and are using GPIO lines for an I2C bus. | 282 | system and are using GPIO lines for an I2C bus. |
283 | 283 | ||
284 | This support is also available as a module. If so, the module | 284 | This support is also available as a module. If so, the module |
@@ -293,8 +293,8 @@ config I2C_POWERMAC | |||
293 | default y | 293 | default y |
294 | help | 294 | help |
295 | This exposes the various PowerMac i2c interfaces to the linux i2c | 295 | This exposes the various PowerMac i2c interfaces to the linux i2c |
296 | layer and to userland. It is used by various drivers on the powemac | 296 | layer and to userland. It is used by various drivers on the PowerMac |
297 | platform, thus should generally be enabled. | 297 | platform, and should generally be enabled. |
298 | 298 | ||
299 | This support is also available as a module. If so, the module | 299 | This support is also available as a module. If so, the module |
300 | will be called i2c-powermac. | 300 | will be called i2c-powermac. |
@@ -438,12 +438,12 @@ config I2C_SIMTEC | |||
438 | tristate "Simtec Generic I2C interface" | 438 | tristate "Simtec Generic I2C interface" |
439 | select I2C_ALGOBIT | 439 | select I2C_ALGOBIT |
440 | help | 440 | help |
441 | If you say yes to this option, support will be inclyded for | 441 | If you say yes to this option, support will be included for |
442 | the Simtec Generic I2C interface. This driver is for the | 442 | the Simtec Generic I2C interface. This driver is for the |
443 | simple I2C bus used on newer Simtec products for general | 443 | simple I2C bus used on newer Simtec products for general |
444 | I2C, such as DDC on the Simtec BBD2016A. | 444 | I2C, such as DDC on the Simtec BBD2016A. |
445 | 445 | ||
446 | This driver can also be build as a module. If so, the module | 446 | This driver can also be built as a module. If so, the module |
447 | will be called i2c-simtec. | 447 | will be called i2c-simtec. |
448 | 448 | ||
449 | config SCx200_I2C | 449 | config SCx200_I2C |
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c index 804f0a551c05..b7a9977b025f 100644 --- a/drivers/i2c/busses/i2c-elektor.c +++ b/drivers/i2c/busses/i2c-elektor.c | |||
@@ -19,7 +19,7 @@ | |||
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ | 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ |
20 | /* ------------------------------------------------------------------------- */ | 20 | /* ------------------------------------------------------------------------- */ |
21 | 21 | ||
22 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even | 22 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even |
23 | Frodo Looijaard <frodol@dds.nl> */ | 23 | Frodo Looijaard <frodol@dds.nl> */ |
24 | 24 | ||
25 | /* Partialy rewriten by Oleg I. Vdovikin for mmapped support of | 25 | /* Partialy rewriten by Oleg I. Vdovikin for mmapped support of |
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c index 9832f773651d..f9972f9651e4 100644 --- a/drivers/i2c/busses/i2c-hydra.c +++ b/drivers/i2c/busses/i2c-hydra.c | |||
@@ -7,7 +7,7 @@ | |||
7 | Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org> | 7 | Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org> |
8 | 8 | ||
9 | Based on i2c Support for Via Technologies 82C586B South Bridge | 9 | Based on i2c Support for Via Technologies 82C586B South Bridge |
10 | Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi> | 10 | Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi> |
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/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index e08bacadd6bc..9b43ff7270d0 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * Copyright 1995-97 Simon G. Vogl | 18 | * Copyright 1995-97 Simon G. Vogl |
19 | * 1998-99 Hans Berglund | 19 | * 1998-99 Hans Berglund |
20 | * | 20 | * |
21 | * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> | 21 | * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> |
22 | * and even Frodo Looijaard <frodol@dds.nl> | 22 | * and even Frodo Looijaard <frodol@dds.nl> |
23 | * | 23 | * |
24 | * This program is free software; you can redistribute it and/or modify it | 24 | * This program is free software; you can redistribute it and/or modify it |
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index e471e3bfdc1e..89a30028ddb6 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com> | 8 | * Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com> |
9 | * Copyright (C) 2005 Nokia Corporation | 9 | * Copyright (C) 2005 Nokia Corporation |
10 | * | 10 | * |
11 | * Cleaned up by Juha Yrjölä <juha.yrjola@nokia.com> | 11 | * Cleaned up by Juha Yrjölä <juha.yrjola@nokia.com> |
12 | * | 12 | * |
13 | * This program is free software; you can redistribute it and/or modify | 13 | * This program is free software; you can redistribute it and/or modify |
14 | * it under the terms of the GNU General Public License as published by | 14 | * it under the terms of the GNU General Public License as published by |
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c index 49a95e2887bc..c6faf9bdad18 100644 --- a/drivers/i2c/busses/i2c-parport-light.c +++ b/drivers/i2c/busses/i2c-parport-light.c | |||
@@ -7,7 +7,7 @@ | |||
7 | Copyright (C) 1995-2000 Simon G. Vogl | 7 | Copyright (C) 1995-2000 Simon G. Vogl |
8 | With some changes from: | 8 | With some changes from: |
9 | Frodo Looijaard <frodol@dds.nl> | 9 | Frodo Looijaard <frodol@dds.nl> |
10 | Kyösti Mälkki <kmalkki@cc.hut.fi> | 10 | Kyösti Mälkki <kmalkki@cc.hut.fi> |
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/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c index 039a07fde908..59ba2086d2f9 100644 --- a/drivers/i2c/busses/i2c-parport.c +++ b/drivers/i2c/busses/i2c-parport.c | |||
@@ -7,7 +7,7 @@ | |||
7 | Copyright (C) 1995-2000 Simon G. Vogl | 7 | Copyright (C) 1995-2000 Simon G. Vogl |
8 | With some changes from: | 8 | With some changes from: |
9 | Frodo Looijaard <frodol@dds.nl> | 9 | Frodo Looijaard <frodol@dds.nl> |
10 | Kyösti Mälkki <kmalkki@cc.hut.fi> | 10 | Kyösti Mälkki <kmalkki@cc.hut.fi> |
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/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c index 81520868797b..61716f6b14dc 100644 --- a/drivers/i2c/busses/i2c-via.c +++ b/drivers/i2c/busses/i2c-via.c | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | i2c Support for Via Technologies 82C586B South Bridge | 5 | i2c Support for Via Technologies 82C586B South Bridge |
6 | 6 | ||
7 | Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi> | 7 | Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi> |
8 | 8 | ||
9 | This program is free software; you can redistribute it and/or modify | 9 | This program is free software; you can redistribute it and/or modify |
10 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
@@ -176,7 +176,7 @@ static void __exit i2c_vt586b_exit(void) | |||
176 | } | 176 | } |
177 | 177 | ||
178 | 178 | ||
179 | MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>"); | 179 | MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>"); |
180 | MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge"); | 180 | MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge"); |
181 | MODULE_LICENSE("GPL"); | 181 | MODULE_LICENSE("GPL"); |
182 | 182 | ||
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c index edc275002f80..c9ce77f13c0e 100644 --- a/drivers/i2c/busses/i2c-viapro.c +++ b/drivers/i2c/busses/i2c-viapro.c | |||
@@ -2,7 +2,7 @@ | |||
2 | i2c-viapro.c - Part of lm_sensors, Linux kernel modules for hardware | 2 | i2c-viapro.c - Part of lm_sensors, Linux kernel modules for hardware |
3 | monitoring | 3 | monitoring |
4 | Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, | 4 | Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, |
5 | Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>, | 5 | Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>, |
6 | Mark D. Studebaker <mdsxyz123@yahoo.com> | 6 | Mark D. Studebaker <mdsxyz123@yahoo.com> |
7 | Copyright (C) 2005 - 2007 Jean Delvare <khali@linux-fr.org> | 7 | Copyright (C) 2005 - 2007 Jean Delvare <khali@linux-fr.org> |
8 | 8 | ||
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index e73d58c43f38..1a4e8dc03b36 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
@@ -17,7 +17,7 @@ | |||
17 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ | 17 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ |
18 | /* ------------------------------------------------------------------------- */ | 18 | /* ------------------------------------------------------------------------- */ |
19 | 19 | ||
20 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>. | 20 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>. |
21 | All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl> | 21 | All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl> |
22 | SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and | 22 | SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and |
23 | Jean Delvare <khali@linux-fr.org> */ | 23 | Jean Delvare <khali@linux-fr.org> */ |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index ca843522f91d..57a5f63d6ae3 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -120,7 +120,7 @@ | |||
120 | * Reformat to match kernel tabbing style. | 120 | * Reformat to match kernel tabbing style. |
121 | * Add CDROM_GET_UPC ioctl. | 121 | * Add CDROM_GET_UPC ioctl. |
122 | * 3.10 Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI. | 122 | * 3.10 Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI. |
123 | * 3.11 Apr 29, 1996 -- Patch from Heiko Eissfeldt <heiko@colossus.escape.de> | 123 | * 3.11 Apr 29, 1996 -- Patch from Heiko Eißfeldt <heiko@colossus.escape.de> |
124 | * to remove redundant verify_area calls. | 124 | * to remove redundant verify_area calls. |
125 | * 3.12 May 7, 1996 -- Rudimentary changer support. Based on patches | 125 | * 3.12 May 7, 1996 -- Rudimentary changer support. Based on patches |
126 | * from Gerhard Zuber <zuber@berlin.snafu.de>. | 126 | * from Gerhard Zuber <zuber@berlin.snafu.de>. |
@@ -256,7 +256,7 @@ | |||
256 | * - Minimize the TOC reading - only do it when we | 256 | * - Minimize the TOC reading - only do it when we |
257 | * know a media change has occurred. | 257 | * know a media change has occurred. |
258 | * - Moved all the CDROMREADx ioctls to the Uniform layer. | 258 | * - Moved all the CDROMREADx ioctls to the Uniform layer. |
259 | * - Heiko Eissfeldt <heiko@colossus.escape.de> supplied | 259 | * - Heiko Eißfeldt <heiko@colossus.escape.de> supplied |
260 | * some fixes for CDI. | 260 | * some fixes for CDI. |
261 | * - CD-ROM leaving door locked fix from Andries | 261 | * - CD-ROM leaving door locked fix from Andries |
262 | * Brouwer <Andries.Brouwer@cwi.nl> | 262 | * Brouwer <Andries.Brouwer@cwi.nl> |
@@ -2341,7 +2341,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense) | |||
2341 | If we get an error for the regular case, we assume | 2341 | If we get an error for the regular case, we assume |
2342 | a CDI without additional audio tracks. In this case | 2342 | a CDI without additional audio tracks. In this case |
2343 | the readable TOC is empty (CDI tracks are not included) | 2343 | the readable TOC is empty (CDI tracks are not included) |
2344 | and only holds the Leadout entry. Heiko Eißfeldt */ | 2344 | and only holds the Leadout entry. Heiko Eißfeldt */ |
2345 | ntracks = 0; | 2345 | ntracks = 0; |
2346 | stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0, | 2346 | stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0, |
2347 | (char *)&toc->hdr, | 2347 | (char *)&toc->hdr, |
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index e5a86a962b26..7b9181b5469d 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -565,7 +565,7 @@ typedef struct os_dat_s { | |||
565 | * The following parameter is used to select the point in the internal | 565 | * The following parameter is used to select the point in the internal |
566 | * tape fifo in which we will start to refill the buffer. Decreasing | 566 | * tape fifo in which we will start to refill the buffer. Decreasing |
567 | * the following parameter will improve the system's latency and | 567 | * the following parameter will improve the system's latency and |
568 | * interactive response, while using a high value might improve sytem | 568 | * interactive response, while using a high value might improve system |
569 | * throughput. | 569 | * throughput. |
570 | */ | 570 | */ |
571 | #define IDETAPE_FIFO_THRESHOLD 2 | 571 | #define IDETAPE_FIFO_THRESHOLD 2 |
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c index 44cdb745a6ff..a73db1bd482d 100644 --- a/drivers/ide/legacy/q40ide.c +++ b/drivers/ide/legacy/q40ide.c | |||
@@ -101,7 +101,7 @@ void q40_ide_setup_ports ( hw_regs_t *hw, | |||
101 | 101 | ||
102 | /* | 102 | /* |
103 | * the static array is needed to have the name reported in /proc/ioports, | 103 | * the static array is needed to have the name reported in /proc/ioports, |
104 | * hwif->name unfortunately isn´t available yet | 104 | * hwif->name unfortunately isn't available yet |
105 | */ | 105 | */ |
106 | static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={ | 106 | static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={ |
107 | "ide0", "ide1" | 107 | "ide0", "ide1" |
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index 1a7ddd12e65c..5c9975435319 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
@@ -95,7 +95,7 @@ struct it821x_dev | |||
95 | 95 | ||
96 | /* | 96 | /* |
97 | * We allow users to force the card into non raid mode without | 97 | * We allow users to force the card into non raid mode without |
98 | * flashing the alternative BIOS. This is also neccessary right now | 98 | * flashing the alternative BIOS. This is also necessary right now |
99 | * for embedded platforms that cannot run a PC BIOS but are using this | 99 | * for embedded platforms that cannot run a PC BIOS but are using this |
100 | * device. | 100 | * device. |
101 | */ | 101 | */ |
@@ -564,7 +564,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif) | |||
564 | 564 | ||
565 | /* | 565 | /* |
566 | * Not in the docs but according to the reference driver | 566 | * Not in the docs but according to the reference driver |
567 | * this is neccessary. | 567 | * this is necessary. |
568 | */ | 568 | */ |
569 | 569 | ||
570 | pci_read_config_byte(hwif->pci_dev, 0x08, &conf); | 570 | pci_read_config_byte(hwif->pci_dev, 0x08, &conf); |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index dc915cb22bec..6d99441c605b 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * | 26 | * |
27 | * If you have strange problems with nVidia chipset systems please | 27 | * If you have strange problems with nVidia chipset systems please |
28 | * see the SI support documentation and update your system BIOS | 28 | * see the SI support documentation and update your system BIOS |
29 | * if neccessary | 29 | * if necessary |
30 | * | 30 | * |
31 | * The Dell DRAC4 has some interesting features including effectively hot | 31 | * The Dell DRAC4 has some interesting features including effectively hot |
32 | * unplugging/replugging the virtual CD interface when the DRAC is reset. | 32 | * unplugging/replugging the virtual CD interface when the DRAC is reset. |
diff --git a/drivers/input/fixp-arith.h b/drivers/input/fixp-arith.h index ed3d2da0c485..3089d7382325 100644 --- a/drivers/input/fixp-arith.h +++ b/drivers/input/fixp-arith.h | |||
@@ -24,7 +24,7 @@ | |||
24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
25 | * | 25 | * |
26 | * Should you need to contact me, the author, you can do so by | 26 | * Should you need to contact me, the author, you can do so by |
27 | * e-mail - mail your message to <deneux@ifrance.com> | 27 | * e-mail - mail your message to <johann.deneux@gmail.com> |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c index 27fc475bd3a1..a6ca9d5e252f 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Copyright (c) 1999-2001 Vojtech Pavlik | 4 | * Copyright (c) 1999-2001 Vojtech Pavlik |
5 | * | 5 | * |
6 | * Based on the work of: | 6 | * Based on the work of: |
7 | * Andree Borrmann Mats Sjövall | 7 | * Andree Borrmann Mats Sjövall |
8 | */ | 8 | */ |
9 | 9 | ||
10 | /* | 10 | /* |
diff --git a/drivers/input/joystick/iforce/Makefile b/drivers/input/joystick/iforce/Makefile index 17ae42bf9ffd..74daff49ab6e 100644 --- a/drivers/input/joystick/iforce/Makefile +++ b/drivers/input/joystick/iforce/Makefile | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Makefile for the I-Force driver | 2 | # Makefile for the I-Force driver |
3 | # | 3 | # |
4 | # By Johann Deneux <deneux@ifrance.com> | 4 | # By Johann Deneux <johann.deneux@gmail.com> |
5 | # | 5 | # |
6 | 6 | ||
7 | # Goal definition | 7 | # Goal definition |
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 76f1969552c5..babc913d5492 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * OMAP Keypad Driver | 4 | * OMAP Keypad Driver |
5 | * | 5 | * |
6 | * Copyright (C) 2003 Nokia Corporation | 6 | * Copyright (C) 2003 Nokia Corporation |
7 | * Written by Timo Teräs <ext-timo.teras@nokia.com> | 7 | * Written by Timo Teräs <ext-timo.teras@nokia.com> |
8 | * | 8 | * |
9 | * Added support for H2 & H3 Keypad | 9 | * Added support for H2 & H3 Keypad |
10 | * Copyright (C) 2004 Texas Instruments | 10 | * Copyright (C) 2004 Texas Instruments |
@@ -481,6 +481,6 @@ static void __exit omap_kp_exit(void) | |||
481 | module_init(omap_kp_init); | 481 | module_init(omap_kp_init); |
482 | module_exit(omap_kp_exit); | 482 | module_exit(omap_kp_exit); |
483 | 483 | ||
484 | MODULE_AUTHOR("Timo Teräs"); | 484 | MODULE_AUTHOR("Timo Teräs"); |
485 | MODULE_DESCRIPTION("OMAP Keypad Driver"); | 485 | MODULE_DESCRIPTION("OMAP Keypad Driver"); |
486 | MODULE_LICENSE("GPL"); | 486 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 7acc6351bb44..8f5c7b90187d 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
@@ -70,9 +70,9 @@ config INPUT_WISTRON_BTNS | |||
70 | select LEDS_CLASS | 70 | select LEDS_CLASS |
71 | select CHECK_SIGNATURE | 71 | select CHECK_SIGNATURE |
72 | help | 72 | help |
73 | Say Y here for support of Winstron laptop button interface, used on | 73 | Say Y here for support of Wistron laptop button interfaces, used on |
74 | laptops of various brands, including Acer and Fujitsu-Siemens. If | 74 | laptops of various brands, including Acer and Fujitsu-Siemens. If |
75 | available, mail and wifi leds will be controlable via /sys/class/leds. | 75 | available, mail and wifi LEDs will be controllable via /sys/class/leds. |
76 | 76 | ||
77 | To compile this driver as a module, choose M here: the module will | 77 | To compile this driver as a module, choose M here: the module will |
78 | be called wistron_btns. | 78 | be called wistron_btns. |
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index da316d13d7f5..21a9c0b69a1f 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
@@ -906,7 +906,7 @@ static void psmouse_activate(struct psmouse *psmouse) | |||
906 | 906 | ||
907 | /* | 907 | /* |
908 | * psmouse_deactivate() puts the mouse into poll mode so that we don't get motion | 908 | * psmouse_deactivate() puts the mouse into poll mode so that we don't get motion |
909 | * reports from it unless we explicitely request it. | 909 | * reports from it unless we explicitly request it. |
910 | */ | 910 | */ |
911 | 911 | ||
912 | static void psmouse_deactivate(struct psmouse *psmouse) | 912 | static void psmouse_deactivate(struct psmouse *psmouse) |
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c index 4a321576f345..404eedd5ffa2 100644 --- a/drivers/input/mouse/vsxxxaa.c +++ b/drivers/input/mouse/vsxxxaa.c | |||
@@ -330,7 +330,7 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse) | |||
330 | 330 | ||
331 | /* | 331 | /* |
332 | * Check for Power-On-Reset packets. These are sent out | 332 | * Check for Power-On-Reset packets. These are sent out |
333 | * after plugging the mouse in, or when explicitely | 333 | * after plugging the mouse in, or when explicitly |
334 | * requested by sending 'T'. | 334 | * requested by sending 'T'. |
335 | * | 335 | * |
336 | * [0]: 1 0 1 0 R3 R2 R1 R0 | 336 | * [0]: 1 0 1 0 R3 R2 R1 R0 |
diff --git a/drivers/isdn/act2000/act2000_isa.c b/drivers/isdn/act2000/act2000_isa.c index 09ea50dd3459..819ea85576a3 100644 --- a/drivers/isdn/act2000/act2000_isa.c +++ b/drivers/isdn/act2000/act2000_isa.c | |||
@@ -126,7 +126,7 @@ act2000_isa_enable_irq(act2000_card * card) | |||
126 | 126 | ||
127 | /* | 127 | /* |
128 | * Install interrupt handler, enable irq on card. | 128 | * Install interrupt handler, enable irq on card. |
129 | * If irq is -1, choose next free irq, else irq is given explicitely. | 129 | * If irq is -1, choose next free irq, else irq is given explicitly. |
130 | */ | 130 | */ |
131 | int | 131 | int |
132 | act2000_isa_config_irq(act2000_card * card, short irq) | 132 | act2000_isa_config_irq(act2000_card * card, short irq) |
diff --git a/drivers/isdn/hardware/eicon/capifunc.c b/drivers/isdn/hardware/eicon/capifunc.c index 82edc1c1db7a..4d425c644d41 100644 --- a/drivers/isdn/hardware/eicon/capifunc.c +++ b/drivers/isdn/hardware/eicon/capifunc.c | |||
@@ -321,7 +321,7 @@ void sendf(APPL * appl, word command, dword Id, word Number, byte * format, ...) | |||
321 | DBG_BLK((((char *)(long)GET_DWORD(&msg.info.data_b3_ind.Data)) + i, | 321 | DBG_BLK((((char *)(long)GET_DWORD(&msg.info.data_b3_ind.Data)) + i, |
322 | ((dlength - i) < 256) ? (dlength - i) : 256)) | 322 | ((dlength - i) < 256) ? (dlength - i) : 256)) |
323 | if (!(myDriverDebugHandle.dbgMask & DL_PRV0)) | 323 | if (!(myDriverDebugHandle.dbgMask & DL_PRV0)) |
324 | break; /* not more if not explicitely requested */ | 324 | break; /* not more if not explicitly requested */ |
325 | } | 325 | } |
326 | } | 326 | } |
327 | break; | 327 | break; |
@@ -965,7 +965,7 @@ static u16 diva_send_message(struct capi_ctr *ctrl, | |||
965 | ((GET_WORD(&msg->info.data_b3_req.Data_Length) - j) < | 965 | ((GET_WORD(&msg->info.data_b3_req.Data_Length) - j) < |
966 | 256) ? (GET_WORD(&msg->info.data_b3_req.Data_Length) - j) : 256)) | 966 | 256) ? (GET_WORD(&msg->info.data_b3_req.Data_Length) - j) : 256)) |
967 | if (!(myDriverDebugHandle.dbgMask & DL_PRV0)) | 967 | if (!(myDriverDebugHandle.dbgMask & DL_PRV0)) |
968 | break; /* not more if not explicitely requested */ | 968 | break; /* not more if not explicitly requested */ |
969 | } | 969 | } |
970 | } | 970 | } |
971 | #endif | 971 | #endif |
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c index 3b19caeba258..c0d7036404a5 100644 --- a/drivers/isdn/hisax/amd7930_fn.c +++ b/drivers/isdn/hisax/amd7930_fn.c | |||
@@ -767,7 +767,7 @@ Amd7930_init(struct IsdnCardState *cs) | |||
767 | /* read */ | 767 | /* read */ |
768 | if (*ptr++ >= 0x100) { | 768 | if (*ptr++ >= 0x100) { |
769 | if (cmd < 8) | 769 | if (cmd < 8) |
770 | /* setzt Register zurück */ | 770 | /* reset register */ |
771 | rByteAMD(cs, cmd); | 771 | rByteAMD(cs, cmd); |
772 | else { | 772 | else { |
773 | wByteAMD(cs, 0x00, cmd); | 773 | wByteAMD(cs, 0x00, cmd); |
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index b73027ff50e8..39f421ed8de8 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c | |||
@@ -75,16 +75,16 @@ | |||
75 | static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $"; | 75 | static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $"; |
76 | 76 | ||
77 | 77 | ||
78 | /* für PowerISDN PCI */ | 78 | /* for PowerISDN PCI */ |
79 | #define TJ_AMD_IRQ 0x20 | 79 | #define TJ_AMD_IRQ 0x20 |
80 | #define TJ_LED1 0x40 | 80 | #define TJ_LED1 0x40 |
81 | #define TJ_LED2 0x80 | 81 | #define TJ_LED2 0x80 |
82 | 82 | ||
83 | 83 | ||
84 | /* Das Fenster zum AMD... | 84 | /* The window to [the] AMD [chip]... |
85 | * Ab Adresse hw.njet.base + TJ_AMD_PORT werden vom AMD jeweils 8 Bit in | 85 | * From address hw.njet.base + TJ_AMD_PORT onwards, the AMD |
86 | * den TigerJet i/o-Raum gemappt | 86 | * maps [consecutive/multiple] 8 bits into the TigerJet I/O space |
87 | * -> 0x01 des AMD bei hw.njet.base + 0C4 */ | 87 | * -> 0x01 of the AMD at hw.njet.base + 0C4 */ |
88 | #define TJ_AMD_PORT 0xC0 | 88 | #define TJ_AMD_PORT 0xC0 |
89 | 89 | ||
90 | 90 | ||
@@ -96,11 +96,11 @@ static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $"; | |||
96 | static unsigned char | 96 | static unsigned char |
97 | ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset) | 97 | ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset) |
98 | { | 98 | { |
99 | /* direktes Register */ | 99 | /* direct register */ |
100 | if(offset < 8) | 100 | if(offset < 8) |
101 | return (inb(cs->hw.njet.isac + 4*offset)); | 101 | return (inb(cs->hw.njet.isac + 4*offset)); |
102 | 102 | ||
103 | /* indirektes Register */ | 103 | /* indirect register */ |
104 | else { | 104 | else { |
105 | outb(offset, cs->hw.njet.isac + 4*AMD_CR); | 105 | outb(offset, cs->hw.njet.isac + 4*AMD_CR); |
106 | return(inb(cs->hw.njet.isac + 4*AMD_DR)); | 106 | return(inb(cs->hw.njet.isac + 4*AMD_DR)); |
@@ -111,11 +111,11 @@ ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset) | |||
111 | static void | 111 | static void |
112 | WriteByteAmd7930(struct IsdnCardState *cs, unsigned char offset, unsigned char value) | 112 | WriteByteAmd7930(struct IsdnCardState *cs, unsigned char offset, unsigned char value) |
113 | { | 113 | { |
114 | /* direktes Register */ | 114 | /* direct register */ |
115 | if(offset < 8) | 115 | if(offset < 8) |
116 | outb(value, cs->hw.njet.isac + 4*offset); | 116 | outb(value, cs->hw.njet.isac + 4*offset); |
117 | 117 | ||
118 | /* indirektes Register */ | 118 | /* indirect register */ |
119 | else { | 119 | else { |
120 | outb(offset, cs->hw.njet.isac + 4*AMD_CR); | 120 | outb(offset, cs->hw.njet.isac + 4*AMD_CR); |
121 | outb(value, cs->hw.njet.isac + 4*AMD_DR); | 121 | outb(value, cs->hw.njet.isac + 4*AMD_DR); |
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 077080aca799..fba8b624ffcf 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* $Id: hfc_pci.c,v 1.48.2.4 2004/02/11 13:21:33 keil Exp $ | 1 | /* $Id: hfc_pci.c,v 1.48.2.4 2004/02/11 13:21:33 keil Exp $ |
2 | * | 2 | * |
3 | * low level driver for CCD´s hfc-pci based cards | 3 | * low level driver for CCD's hfc-pci based cards |
4 | * | 4 | * |
5 | * Author Werner Cornelius | 5 | * Author Werner Cornelius |
6 | * based on existing driver for CCD hfc ISA cards | 6 | * based on existing driver for CCD hfc ISA cards |
diff --git a/drivers/isdn/hisax/isdnhdlc.c b/drivers/isdn/hisax/isdnhdlc.c index 268dced6c34a..c69a77a80062 100644 --- a/drivers/isdn/hisax/isdnhdlc.c +++ b/drivers/isdn/hisax/isdnhdlc.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * isdnhdlc.c -- General purpose ISDN HDLC decoder. | 2 | * isdnhdlc.c -- General purpose ISDN HDLC decoder. |
3 | * | 3 | * |
4 | *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de> | 4 | *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de> |
5 | * 2001 Frode Isaksen <fisaksen@bewan.com> | 5 | * 2001 Frode Isaksen <fisaksen@bewan.com> |
6 | * 2001 Kai Germaschewski <kai.germaschewski@gmx.de> | 6 | * 2001 Kai Germaschewski <kai.germaschewski@gmx.de> |
7 | * | 7 | * |
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | /*-------------------------------------------------------------------*/ | 28 | /*-------------------------------------------------------------------*/ |
29 | 29 | ||
30 | MODULE_AUTHOR("Wolfgang Mües <wolfgang@iksw-muees.de>, " | 30 | MODULE_AUTHOR("Wolfgang Mües <wolfgang@iksw-muees.de>, " |
31 | "Frode Isaksen <fisaksen@bewan.com>, " | 31 | "Frode Isaksen <fisaksen@bewan.com>, " |
32 | "Kai Germaschewski <kai.germaschewski@gmx.de>"); | 32 | "Kai Germaschewski <kai.germaschewski@gmx.de>"); |
33 | MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); | 33 | MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); |
diff --git a/drivers/isdn/hisax/isdnhdlc.h b/drivers/isdn/hisax/isdnhdlc.h index 45167d2f8fb0..cf0a95a24015 100644 --- a/drivers/isdn/hisax/isdnhdlc.h +++ b/drivers/isdn/hisax/isdnhdlc.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * Neccessary because some ISDN devices don't have HDLC | 5 | * Neccessary because some ISDN devices don't have HDLC |
6 | * controllers. Also included: a bit reversal table. | 6 | * controllers. Also included: a bit reversal table. |
7 | * | 7 | * |
8 | *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de> | 8 | *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de> |
9 | * 2001 Frode Isaksen <fisaksen@bewan.com> | 9 | * 2001 Frode Isaksen <fisaksen@bewan.com> |
10 | * 2001 Kai Germaschewski <kai.germaschewski@gmx.de> | 10 | * 2001 Kai Germaschewski <kai.germaschewski@gmx.de> |
11 | * | 11 | * |
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c index 43d61d1bc5b6..70840a710acf 100644 --- a/drivers/isdn/hisax/jade.c +++ b/drivers/isdn/hisax/jade.c | |||
@@ -304,7 +304,7 @@ initjade(struct IsdnCardState *cs) | |||
304 | cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00); | 304 | cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00); |
305 | /* Setup host access to hdlc controller */ | 305 | /* Setup host access to hdlc controller */ |
306 | jade_write_indirect(cs, jade_HDLCCNTRACCESS, (jadeINDIRECT_HAH1|jadeINDIRECT_HAH2)); | 306 | jade_write_indirect(cs, jade_HDLCCNTRACCESS, (jadeINDIRECT_HAH1|jadeINDIRECT_HAH2)); |
307 | /* Unmask HDLC int (don´t forget DSP int later on)*/ | 307 | /* Unmask HDLC int (don't forget DSP int later on)*/ |
308 | cs->BC_Write_Reg(cs, -1,jade_INT, (jadeINT_HDLC1|jadeINT_HDLC2)); | 308 | cs->BC_Write_Reg(cs, -1,jade_INT, (jadeINT_HDLC1|jadeINT_HDLC2)); |
309 | 309 | ||
310 | /* once again TRANSPARENT */ | 310 | /* once again TRANSPARENT */ |
diff --git a/drivers/isdn/pcbit/capi.c b/drivers/isdn/pcbit/capi.c index 7b55e151f1b0..ac5a91ccde81 100644 --- a/drivers/isdn/pcbit/capi.c +++ b/drivers/isdn/pcbit/capi.c | |||
@@ -15,9 +15,9 @@ | |||
15 | 15 | ||
16 | /* | 16 | /* |
17 | * Documentation: | 17 | * Documentation: |
18 | * - "Common ISDN API - Perfil Português - Versão 2.1", | 18 | * - "Common ISDN API - Perfil Português - Versão 2.1", |
19 | * Telecom Portugal, Fev 1992. | 19 | * Telecom Portugal, Fev 1992. |
20 | * - "Common ISDN API - Especificação de protocolos para | 20 | * - "Common ISDN API - Especificação de protocolos para |
21 | * acesso aos canais B", Inesc, Jan 1994. | 21 | * acesso aos canais B", Inesc, Jan 1994. |
22 | */ | 22 | */ |
23 | 23 | ||
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c index 50914439d861..0fd640751294 100644 --- a/drivers/leds/leds-s3c24xx.c +++ b/drivers/leds/leds-s3c24xx.c | |||
@@ -43,7 +43,7 @@ static void s3c24xx_led_set(struct led_classdev *led_cdev, | |||
43 | struct s3c24xx_gpio_led *led = to_gpio(led_cdev); | 43 | struct s3c24xx_gpio_led *led = to_gpio(led_cdev); |
44 | struct s3c24xx_led_platdata *pd = led->pdata; | 44 | struct s3c24xx_led_platdata *pd = led->pdata; |
45 | 45 | ||
46 | /* there will be a sort delay between setting the output and | 46 | /* there will be a short delay between setting the output and |
47 | * going from output to input when using tristate. */ | 47 | * going from output to input when using tristate. */ |
48 | 48 | ||
49 | s3c2410_gpio_setpin(pd->gpio, (value ? 1 : 0) ^ | 49 | s3c2410_gpio_setpin(pd->gpio, (value ? 1 : 0) ^ |
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index f7c509b7a8ea..dc741d3a4531 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
@@ -1521,7 +1521,7 @@ pmu_sr_intr(void) | |||
1521 | req = current_req; | 1521 | req = current_req; |
1522 | /* | 1522 | /* |
1523 | * For PMU sleep and freq change requests, we lock the | 1523 | * For PMU sleep and freq change requests, we lock the |
1524 | * PMU until it's explicitely unlocked. This avoids any | 1524 | * PMU until it's explicitly unlocked. This avoids any |
1525 | * spurrious event polling getting in | 1525 | * spurrious event polling getting in |
1526 | */ | 1526 | */ |
1527 | current_req = req->next; | 1527 | current_req = req->next; |
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index b41f945df8a1..0eb5416798bd 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
@@ -113,7 +113,7 @@ static void clone_init(struct dm_crypt_io *, struct bio *); | |||
113 | * Different IV generation algorithms: | 113 | * Different IV generation algorithms: |
114 | * | 114 | * |
115 | * plain: the initial vector is the 32-bit little-endian version of the sector | 115 | * plain: the initial vector is the 32-bit little-endian version of the sector |
116 | * number, padded with zeros if neccessary. | 116 | * number, padded with zeros if necessary. |
117 | * | 117 | * |
118 | * essiv: "encrypted sector|salt initial vector", the sector number is | 118 | * essiv: "encrypted sector|salt initial vector", the sector number is |
119 | * encrypted with the bulk cipher using a salt as key. The salt | 119 | * encrypted with the bulk cipher using a salt as key. The salt |
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 16775a0df7f6..85478d6a9c1a 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * | 9 | * |
10 | * Better read-balancing code written by Mika Kuoppala <miku@iki.fi>, 2000 | 10 | * Better read-balancing code written by Mika Kuoppala <miku@iki.fi>, 2000 |
11 | * | 11 | * |
12 | * Fixes to reconstruction by Jakob Østergaard" <jakob@ostenfeld.dk> | 12 | * Fixes to reconstruction by Jakob Østergaard" <jakob@ostenfeld.dk> |
13 | * Various fixes by Neil Brown <neilb@cse.unsw.edu.au> | 13 | * Various fixes by Neil Brown <neilb@cse.unsw.edu.au> |
14 | * | 14 | * |
15 | * Changes by Peter T. Breuer <ptb@it.uc3m.es> 31/1/2003 to support | 15 | * Changes by Peter T. Breuer <ptb@it.uc3m.es> 31/1/2003 to support |
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c index d2905720eb74..9c905399a233 100644 --- a/drivers/media/common/saa7146_hlp.c +++ b/drivers/media/common/saa7146_hlp.c | |||
@@ -312,7 +312,7 @@ static int sort_and_eliminate(u32* values, int* count) | |||
312 | return -EINVAL; | 312 | return -EINVAL; |
313 | } | 313 | } |
314 | 314 | ||
315 | /* bubble sort the first ´count´ items of the array ´values´ */ | 315 | /* bubble sort the first @count items of the array @values */ |
316 | for( top = *count; top > 0; top--) { | 316 | for( top = *count; top > 0; top--) { |
317 | for( low = 0, high = 1; high < top; low++, high++) { | 317 | for( low = 0, high = 1; high < top; low++, high++) { |
318 | if( values[low] > values[high] ) { | 318 | if( values[low] > values[high] ) { |
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c index eca602d9b3de..85e36a1d6d78 100644 --- a/drivers/media/dvb/bt8xx/bt878.c +++ b/drivers/media/dvb/bt8xx/bt878.c | |||
@@ -280,7 +280,7 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) | |||
280 | if (!(astat = (stat & mask))) | 280 | if (!(astat = (stat & mask))) |
281 | return IRQ_NONE; /* this interrupt is not for me */ | 281 | return IRQ_NONE; /* this interrupt is not for me */ |
282 | /* dprintk("bt878(%d) debug: irq count %d, stat 0x%8.8x, mask 0x%8.8x\n",bt->nr,count,stat,mask); */ | 282 | /* dprintk("bt878(%d) debug: irq count %d, stat 0x%8.8x, mask 0x%8.8x\n",bt->nr,count,stat,mask); */ |
283 | btwrite(astat, BT878_AINT_STAT); /* try to clear interupt condition */ | 283 | btwrite(astat, BT878_AINT_STAT); /* try to clear interrupt condition */ |
284 | 284 | ||
285 | 285 | ||
286 | if (astat & (BT878_ASCERR | BT878_AOCERR)) { | 286 | if (astat & (BT878_ASCERR | BT878_AOCERR)) { |
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c index 154a7ce7cb82..a05e5c182288 100644 --- a/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/drivers/media/dvb/cinergyT2/cinergyT2.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * TerraTec Cinergy T²/qanu USB2 DVB-T adapter. | 2 | * TerraTec Cinergy T²/qanu USB2 DVB-T adapter. |
3 | * | 3 | * |
4 | * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and | 4 | * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and |
5 | * Holger Waechtler <holger@qanu.de> | 5 | * Holger Waechtler <holger@qanu.de> |
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 288e79f2cb0f..7902ae1d9a18 100644 --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | |||
@@ -128,7 +128,7 @@ struct ttusb { | |||
128 | struct dvb_frontend* fe; | 128 | struct dvb_frontend* fe; |
129 | }; | 129 | }; |
130 | 130 | ||
131 | /* ugly workaround ... don't know why it's neccessary to read */ | 131 | /* ugly workaround ... don't know why it's necessary to read */ |
132 | /* all result codes. */ | 132 | /* all result codes. */ |
133 | 133 | ||
134 | #define DEBUG 0 | 134 | #define DEBUG 0 |
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index dd6a7d68b07f..3abd9fa54d2c 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -1259,7 +1259,7 @@ struct tvcard bttv_tvcards[] = { | |||
1259 | .has_radio = 1, | 1259 | .has_radio = 1, |
1260 | }, | 1260 | }, |
1261 | [BTTV_BOARD_LIFETEC_9415] = { | 1261 | [BTTV_BOARD_LIFETEC_9415] = { |
1262 | /* Tim Röstermundt <rosterm@uni-muenster.de> | 1262 | /* Tim Röstermundt <rosterm@uni-muenster.de> |
1263 | in de.comp.os.unix.linux.hardware: | 1263 | in de.comp.os.unix.linux.hardware: |
1264 | options bttv card=0 pll=1 radio=1 gpiomask=0x18e0 | 1264 | options bttv card=0 pll=1 radio=1 gpiomask=0x18e0 |
1265 | gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff | 1265 | gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff |
@@ -2824,7 +2824,7 @@ struct tvcard bttv_tvcards[] = { | |||
2824 | }, | 2824 | }, |
2825 | /* ---- card 0x8b ---------------------------------- */ | 2825 | /* ---- card 0x8b ---------------------------------- */ |
2826 | [BTTV_BOARD_PV_M4900] = { | 2826 | [BTTV_BOARD_PV_M4900] = { |
2827 | /* Sérgio Fortier <sergiofortier@yahoo.com.br> */ | 2827 | /* Sérgio Fortier <sergiofortier@yahoo.com.br> */ |
2828 | .name = "Prolink PixelView PlayTV MPEG2 PV-M4900", | 2828 | .name = "Prolink PixelView PlayTV MPEG2 PV-M4900", |
2829 | .video_inputs = 3, | 2829 | .video_inputs = 3, |
2830 | .audio_inputs = 1, | 2830 | .audio_inputs = 1, |
@@ -4709,18 +4709,18 @@ adtvk503_audio(struct bttv *btv, struct video_audio *v, int set) | |||
4709 | * | 4709 | * |
4710 | * The board hardwire Y0 (xpoint) to MUX1 and MUXOUT to Yin. | 4710 | * The board hardwire Y0 (xpoint) to MUX1 and MUXOUT to Yin. |
4711 | * GPIO pins are wired as: | 4711 | * GPIO pins are wired as: |
4712 | * GPIO[0:3] - AX[0:3] (xpoint) - P1[0:3] (microcontroler) | 4712 | * GPIO[0:3] - AX[0:3] (xpoint) - P1[0:3] (microcontroller) |
4713 | * GPIO[4:6] - AY[0:2] (xpoint) - P1[4:6] (microcontroler) | 4713 | * GPIO[4:6] - AY[0:2] (xpoint) - P1[4:6] (microcontroller) |
4714 | * GPIO[7] - DATA (xpoint) - P1[7] (microcontroler) | 4714 | * GPIO[7] - DATA (xpoint) - P1[7] (microcontroller) |
4715 | * GPIO[8] - - P3[5] (microcontroler) | 4715 | * GPIO[8] - - P3[5] (microcontroller) |
4716 | * GPIO[9] - RESET (xpoint) - P3[6] (microcontroler) | 4716 | * GPIO[9] - RESET (xpoint) - P3[6] (microcontroller) |
4717 | * GPIO[10] - STROBE (xpoint) - P3[7] (microcontroler) | 4717 | * GPIO[10] - STROBE (xpoint) - P3[7] (microcontroller) |
4718 | * GPINTR - - P3[4] (microcontroler) | 4718 | * GPINTR - - P3[4] (microcontroller) |
4719 | * | 4719 | * |
4720 | * The microcontroler is a 80C32 like. It should be possible to change xpoint | 4720 | * The microcontroller is a 80C32 like. It should be possible to change xpoint |
4721 | * configuration either directly (as we are doing) or using the microcontroler | 4721 | * configuration either directly (as we are doing) or using the microcontroller |
4722 | * which is also wired to I2C interface. I have no further info on the | 4722 | * which is also wired to I2C interface. I have no further info on the |
4723 | * microcontroler features, one would need to disassembly the firmware. | 4723 | * microcontroller features, one would need to disassembly the firmware. |
4724 | * note: the vendor refused to give any information on this product, all | 4724 | * note: the vendor refused to give any information on this product, all |
4725 | * that stuff was found using a multimeter! :) | 4725 | * that stuff was found using a multimeter! :) |
4726 | */ | 4726 | */ |
@@ -4788,7 +4788,7 @@ static void tibetCS16_init(struct bttv *btv) | |||
4788 | * The analog switch is controlled by the "master", but the detection order | 4788 | * The analog switch is controlled by the "master", but the detection order |
4789 | * of the four BT878A chips is in an order which I just don't understand. | 4789 | * of the four BT878A chips is in an order which I just don't understand. |
4790 | * The "master" is actually the second controller to be detected. The | 4790 | * The "master" is actually the second controller to be detected. The |
4791 | * logic on the board uses logical numbers for the 4 controlers, but | 4791 | * logic on the board uses logical numbers for the 4 controllers, but |
4792 | * those numbers are different from the detection sequence. When working | 4792 | * those numbers are different from the detection sequence. When working |
4793 | * with the analog switch, we need to "map" from the detection sequence | 4793 | * with the analog switch, we need to "map" from the detection sequence |
4794 | * over to the board's logical controller number. This mapping sequence | 4794 | * over to the board's logical controller number. This mapping sequence |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index b8d5327c438d..e467682aabd7 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -907,7 +907,7 @@ static int em28xx_set_fmt(struct em28xx *dev, unsigned int cmd, struct v4l2_form | |||
907 | 907 | ||
908 | /* stop io in case it is already in progress */ | 908 | /* stop io in case it is already in progress */ |
909 | if (dev->stream == STREAM_ON) { | 909 | if (dev->stream == STREAM_ON) { |
910 | em28xx_videodbg("VIDIOC_SET_FMT: interupting stream\n"); | 910 | em28xx_videodbg("VIDIOC_SET_FMT: interrupting stream\n"); |
911 | if ((ret = em28xx_stream_interrupt(dev))) | 911 | if ((ret = em28xx_stream_interrupt(dev))) |
912 | return ret; | 912 | return ret; |
913 | } | 913 | } |
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index 7533fc203319..69283926a8dc 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> | 4 | * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> |
5 | * | 5 | * |
6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
7 | * | 7 | * |
8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> | 8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> |
9 | * | 9 | * |
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h index 323d0074120d..d535748df445 100644 --- a/drivers/media/video/meye.h +++ b/drivers/media/video/meye.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> | 4 | * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> |
5 | * | 5 | * |
6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
7 | * | 7 | * |
8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> | 8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> |
9 | * | 9 | * |
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index e20aa3612a7c..ad0232935df6 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
@@ -196,10 +196,10 @@ static int i2c_senddata(struct saa5246a_device *t, ...) | |||
196 | return i2c_sendbuf(t, buf[0], ct-1, buf+1); | 196 | return i2c_sendbuf(t, buf[0], ct-1, buf+1); |
197 | } | 197 | } |
198 | 198 | ||
199 | /* Get count number of bytes from I²C-device at address adr, store them in buf. | 199 | /* Get count number of bytes from I²C-device at address adr, store them in buf. |
200 | * Start & stop handshaking is done by this routine, ack will be sent after the | 200 | * Start & stop handshaking is done by this routine, ack will be sent after the |
201 | * last byte to inhibit further sending of data. If uaccess is 'true', data is | 201 | * last byte to inhibit further sending of data. If uaccess is 'true', data is |
202 | * written to user-space with put_user. Returns -1 if I²C-device didn't send | 202 | * written to user-space with put_user. Returns -1 if I²C-device didn't send |
203 | * acknowledge, 0 otherwise | 203 | * acknowledge, 0 otherwise |
204 | */ | 204 | */ |
205 | static int i2c_getdata(struct saa5246a_device *t, int count, u8 *buf) | 205 | static int i2c_getdata(struct saa5246a_device *t, int count, u8 *buf) |
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index 17f1e2e9a66b..94bb59a32b17 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
@@ -291,10 +291,10 @@ static int i2c_senddata(struct saa5249_device *t, ...) | |||
291 | return i2c_sendbuf(t, buf[0], ct-1, buf+1); | 291 | return i2c_sendbuf(t, buf[0], ct-1, buf+1); |
292 | } | 292 | } |
293 | 293 | ||
294 | /* Get count number of bytes from I²C-device at address adr, store them in buf. Start & stop | 294 | /* Get count number of bytes from I²C-device at address adr, store them in buf. Start & stop |
295 | * handshaking is done by this routine, ack will be sent after the last byte to inhibit further | 295 | * handshaking is done by this routine, ack will be sent after the last byte to inhibit further |
296 | * sending of data. If uaccess is 'true', data is written to user-space with put_user. | 296 | * sending of data. If uaccess is 'true', data is written to user-space with put_user. |
297 | * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise | 297 | * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise |
298 | */ | 298 | */ |
299 | 299 | ||
300 | static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf) | 300 | static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf) |
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index ff555129c82f..db3c9e3deb26 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -955,7 +955,7 @@ read_frame(struct vicam_camera *cam, int framenum) | |||
955 | request[7] = realShutter >> 8; | 955 | request[7] = realShutter >> 8; |
956 | } | 956 | } |
957 | 957 | ||
958 | // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0 | 958 | // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0 |
959 | request[8] = 0; | 959 | request[8] = 0; |
960 | // bytes 9-15 do not seem to affect exposure or image quality | 960 | // bytes 9-15 do not seem to affect exposure or image quality |
961 | 961 | ||
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index c3440b280d20..321249240d05 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
@@ -37,7 +37,7 @@ | |||
37 | * Video4linux 1/2 integration by Justin Schoeman | 37 | * Video4linux 1/2 integration by Justin Schoeman |
38 | * <justin@suntiger.ee.up.ac.za> | 38 | * <justin@suntiger.ee.up.ac.za> |
39 | * 2.4 PROCFS support ported from 2.4 kernels by | 39 | * 2.4 PROCFS support ported from 2.4 kernels by |
40 | * Iñaki García Etxebarria <garetxe@euskalnet.net> | 40 | * Iñaki GarcÃa Etxebarria <garetxe@euskalnet.net> |
41 | * Makefile fix by "W. Michael Petullo" <mike@flyn.org> | 41 | * Makefile fix by "W. Michael Petullo" <mike@flyn.org> |
42 | * 2.4 devfs support ported from 2.4 kernels by | 42 | * 2.4 devfs support ported from 2.4 kernels by |
43 | * Dan Merillat <dan@merillat.org> | 43 | * Dan Merillat <dan@merillat.org> |
diff --git a/drivers/message/i2o/README b/drivers/message/i2o/README index a81f851f7b5d..911fc3021e3b 100644 --- a/drivers/message/i2o/README +++ b/drivers/message/i2o/README | |||
@@ -30,13 +30,13 @@ Juha Sievanen, University of Helsinki Finland | |||
30 | Bug fixes | 30 | Bug fixes |
31 | Core code extensions | 31 | Core code extensions |
32 | 32 | ||
33 | Auvo Häkkinen, University of Helsinki Finland | 33 | Auvo Häkkinen, University of Helsinki Finland |
34 | LAN OSM code | 34 | LAN OSM code |
35 | /Proc interface to LAN class | 35 | /Proc interface to LAN class |
36 | Bug fixes | 36 | Bug fixes |
37 | Core code extensions | 37 | Core code extensions |
38 | 38 | ||
39 | Taneli Vähäkangas, University of Helsinki Finland | 39 | Taneli Vähäkangas, University of Helsinki Finland |
40 | Fixes to i2o_config | 40 | Fixes to i2o_config |
41 | 41 | ||
42 | CREDITS | 42 | CREDITS |
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c index ce8f1a34ed21..6cbcc21de518 100644 --- a/drivers/message/i2o/exec-osm.c +++ b/drivers/message/i2o/exec-osm.c | |||
@@ -15,8 +15,8 @@ | |||
15 | * | 15 | * |
16 | * Fixes/additions: | 16 | * Fixes/additions: |
17 | * Philipp Rumpf | 17 | * Philipp Rumpf |
18 | * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI> | 18 | * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI> |
19 | * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI> | 19 | * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI> |
20 | * Deepak Saxena <deepak@plexity.net> | 20 | * Deepak Saxena <deepak@plexity.net> |
21 | * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> | 21 | * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> |
22 | * Alan Cox <alan@redhat.com>: | 22 | * Alan Cox <alan@redhat.com>: |
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index 84e046e94f5f..c0fb77dc19bb 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c | |||
@@ -10,12 +10,12 @@ | |||
10 | * Added basic ioctl() support | 10 | * Added basic ioctl() support |
11 | * Deepak Saxena (06/07/1999): | 11 | * Deepak Saxena (06/07/1999): |
12 | * Added software download ioctl (still testing) | 12 | * Added software download ioctl (still testing) |
13 | * Auvo Häkkinen (09/10/1999): | 13 | * Auvo Häkkinen (09/10/1999): |
14 | * Changes to i2o_cfg_reply(), ioctl_parms() | 14 | * Changes to i2o_cfg_reply(), ioctl_parms() |
15 | * Added ioct_validate() | 15 | * Added ioct_validate() |
16 | * Taneli Vähäkangas (09/30/1999): | 16 | * Taneli Vähäkangas (09/30/1999): |
17 | * Fixed ioctl_swdl() | 17 | * Fixed ioctl_swdl() |
18 | * Taneli Vähäkangas (10/04/1999): | 18 | * Taneli Vähäkangas (10/04/1999): |
19 | * Changed ioctl_swdl(), implemented ioctl_swul() and ioctl_swdel() | 19 | * Changed ioctl_swdl(), implemented ioctl_swul() and ioctl_swdel() |
20 | * Deepak Saxena (11/18/1999): | 20 | * Deepak Saxena (11/18/1999): |
21 | * Added event managmenet support | 21 | * Added event managmenet support |
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c index 06892ac2286e..6fdd072201f9 100644 --- a/drivers/message/i2o/i2o_proc.c +++ b/drivers/message/i2o/i2o_proc.c | |||
@@ -19,8 +19,8 @@ | |||
19 | * | 19 | * |
20 | * | 20 | * |
21 | * Fixes/additions: | 21 | * Fixes/additions: |
22 | * Juha Sievänen (Juha.Sievanen@cs.Helsinki.FI), | 22 | * Juha Sievänen (Juha.Sievanen@cs.Helsinki.FI), |
23 | * Auvo Häkkinen (Auvo.Hakkinen@cs.Helsinki.FI) | 23 | * Auvo Häkkinen (Auvo.Hakkinen@cs.Helsinki.FI) |
24 | * University of Helsinki, Department of Computer Science | 24 | * University of Helsinki, Department of Computer Science |
25 | * LAN entries | 25 | * LAN entries |
26 | * Markus Lidel <Markus.Lidel@shadowconnect.com> | 26 | * Markus Lidel <Markus.Lidel@shadowconnect.com> |
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index a1ec16a075c6..7814a06ae970 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
@@ -15,8 +15,8 @@ | |||
15 | * | 15 | * |
16 | * Fixes/additions: | 16 | * Fixes/additions: |
17 | * Philipp Rumpf | 17 | * Philipp Rumpf |
18 | * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI> | 18 | * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI> |
19 | * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI> | 19 | * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI> |
20 | * Deepak Saxena <deepak@plexity.net> | 20 | * Deepak Saxena <deepak@plexity.net> |
21 | * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> | 21 | * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> |
22 | * Alan Cox <alan@redhat.com>: | 22 | * Alan Cox <alan@redhat.com>: |
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index 3661e6e065d2..685a89547a51 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
@@ -15,8 +15,8 @@ | |||
15 | * | 15 | * |
16 | * Fixes/additions: | 16 | * Fixes/additions: |
17 | * Philipp Rumpf | 17 | * Philipp Rumpf |
18 | * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI> | 18 | * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI> |
19 | * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI> | 19 | * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI> |
20 | * Deepak Saxena <deepak@plexity.net> | 20 | * Deepak Saxena <deepak@plexity.net> |
21 | * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> | 21 | * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> |
22 | * Alan Cox <alan@redhat.com>: | 22 | * Alan Cox <alan@redhat.com>: |
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index a20a51efe118..25716193a534 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
@@ -10,8 +10,8 @@ config MFD_SM501 | |||
10 | ---help--- | 10 | ---help--- |
11 | This is the core driver for the Silicon Motion SM501 multimedia | 11 | This is the core driver for the Silicon Motion SM501 multimedia |
12 | companion chip. This device is a multifunction device which may | 12 | companion chip. This device is a multifunction device which may |
13 | provide numerous interfaces including USB host controller USB gadget, | 13 | provide numerous interfaces including USB host controller, USB gadget, |
14 | Asyncronous Serial ports, Audio functions and a dual display video | 14 | asynchronous serial ports, audio functions, and a dual display video |
15 | interface. The device may be connected by PCI or local bus with | 15 | interface. The device may be connected by PCI or local bus with |
16 | varying functions enabled. | 16 | varying functions enabled. |
17 | 17 | ||
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index cf02ddc3436f..b5e67c0ff433 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -180,7 +180,7 @@ config THINKPAD_ACPI | |||
180 | For more information about this driver see | 180 | For more information about this driver see |
181 | <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . | 181 | <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . |
182 | 182 | ||
183 | This driver was formely known as ibm-acpi. | 183 | This driver was formerly known as ibm-acpi. |
184 | 184 | ||
185 | If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. | 185 | If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. |
186 | 186 | ||
@@ -214,7 +214,7 @@ config THINKPAD_ACPI_BAY | |||
214 | default y | 214 | default y |
215 | ---help--- | 215 | ---help--- |
216 | Allows the thinkpad_acpi driver to handle removable bays. It will | 216 | Allows the thinkpad_acpi driver to handle removable bays. It will |
217 | eletrically disable the device in the bay, and also generate | 217 | electrically disable the device in the bay, and also generate |
218 | notifications when the bay lever is ejected or inserted. | 218 | notifications when the bay lever is ejected or inserted. |
219 | 219 | ||
220 | If you are not sure, say Y here. | 220 | If you are not sure, say Y here. |
diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c index 1d9defb1a10c..477bb43c899c 100644 --- a/drivers/misc/ibmasm/remote.c +++ b/drivers/misc/ibmasm/remote.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * | 17 | * |
18 | * Copyright (C) IBM Corporation, 2004 | 18 | * Copyright (C) IBM Corporation, 2004 |
19 | * | 19 | * |
20 | * Authors: Max Asböck <amax@us.ibm.com> | 20 | * Authors: Max Asböck <amax@us.ibm.com> |
21 | * Vernon Mauery <vernux@us.ibm.com> | 21 | * Vernon Mauery <vernux@us.ibm.com> |
22 | * | 22 | * |
23 | */ | 23 | */ |
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 1bfbb87e5793..bb13858f60a1 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * | 14 | * |
15 | * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> | 15 | * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> |
16 | * | 16 | * |
17 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 17 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
18 | * | 18 | * |
19 | * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> | 19 | * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> |
20 | * | 20 | * |
@@ -277,7 +277,7 @@ static void do_sony_laptop_release_key(struct work_struct *work) | |||
277 | static DECLARE_WORK(sony_laptop_release_key_work, | 277 | static DECLARE_WORK(sony_laptop_release_key_work, |
278 | do_sony_laptop_release_key); | 278 | do_sony_laptop_release_key); |
279 | 279 | ||
280 | /* forward event to the input subsytem */ | 280 | /* forward event to the input subsystem */ |
281 | static void sony_laptop_report_input_event(u8 event) | 281 | static void sony_laptop_report_input_event(u8 event) |
282 | { | 282 | { |
283 | struct input_dev *jog_dev = sony_laptop_input.jog_dev; | 283 | struct input_dev *jog_dev = sony_laptop_input.jog_dev; |
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 2a2a125b0c76..a592fc04cf78 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -54,7 +54,7 @@ config MTD_PHYSMAP_BANKWIDTH | |||
54 | help | 54 | help |
55 | This is the total width of the data bus of the flash devices | 55 | This is the total width of the data bus of the flash devices |
56 | in octets. For example, if you have a data bus width of 32 | 56 | in octets. For example, if you have a data bus width of 32 |
57 | bits, you would set the bus width octect value to 4. This is | 57 | bits, you would set the bus width octet value to 4. This is |
58 | used internally by the CFI drivers. | 58 | used internally by the CFI drivers. |
59 | Ignore this option if you use run-time physmap configuration | 59 | Ignore this option if you use run-time physmap configuration |
60 | (i.e., run-time calling physmap_configure()). | 60 | (i.e., run-time calling physmap_configure()). |
@@ -73,12 +73,12 @@ config MTD_PMC_MSP_EVM | |||
73 | depends on PMC_MSP && MTD_CFI | 73 | depends on PMC_MSP && MTD_CFI |
74 | select MTD_PARTITIONS | 74 | select MTD_PARTITIONS |
75 | help | 75 | help |
76 | This provides a 'mapping' driver which support the way | 76 | This provides a 'mapping' driver which supports the way |
77 | in which user-programmable flash chips are connected on the | 77 | in which user-programmable flash chips are connected on the |
78 | PMC-Sierra MSP eval/demo boards | 78 | PMC-Sierra MSP eval/demo boards. |
79 | 79 | ||
80 | choice | 80 | choice |
81 | prompt "Maximum mappable memory avialable for flash IO" | 81 | prompt "Maximum mappable memory available for flash IO" |
82 | depends on MTD_PMC_MSP_EVM | 82 | depends on MTD_PMC_MSP_EVM |
83 | default MSP_FLASH_MAP_LIMIT_32M | 83 | default MSP_FLASH_MAP_LIMIT_32M |
84 | 84 | ||
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 973b684c11e3..eef6fecfff2a 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -73,7 +73,7 @@ | |||
73 | 73 | ||
74 | Jean-Jacques Michel - bug fix | 74 | Jean-Jacques Michel - bug fix |
75 | 75 | ||
76 | Tobias Ringström - Rx interrupt status checking suggestion | 76 | Tobias Ringström - Rx interrupt status checking suggestion |
77 | 77 | ||
78 | Andrew Morton - Clear blocked signals, avoid | 78 | Andrew Morton - Clear blocked signals, avoid |
79 | buffer overrun setting current->comm. | 79 | buffer overrun setting current->comm. |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 2cafa5c1783e..ce34b539bf38 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -855,7 +855,7 @@ config BFIN_MAC_USE_L1 | |||
855 | depends on BFIN_MAC && BF537 | 855 | depends on BFIN_MAC && BF537 |
856 | default y | 856 | default y |
857 | help | 857 | help |
858 | To get maximum network performace, you should use L1 memory as rx/tx buffers. | 858 | To get maximum network performance, you should use L1 memory as rx/tx buffers. |
859 | Say N here if you want to reserve L1 memory for other uses. | 859 | Say N here if you want to reserve L1 memory for other uses. |
860 | 860 | ||
861 | config BFIN_TX_DESC_NUM | 861 | config BFIN_TX_DESC_NUM |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 1cc74ec88a58..eebf5bb2b03a 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -1111,7 +1111,7 @@ static struct net_device_stats *amd8111e_get_stats(struct net_device * dev) | |||
1111 | 1111 | ||
1112 | return new_stats; | 1112 | return new_stats; |
1113 | } | 1113 | } |
1114 | /* This function recalculate the interupt coalescing mode on every interrupt | 1114 | /* This function recalculate the interrupt coalescing mode on every interrupt |
1115 | according to the datarate and the packet rate. | 1115 | according to the datarate and the packet rate. |
1116 | */ | 1116 | */ |
1117 | static int amd8111e_calc_coalesce(struct net_device *dev) | 1117 | static int amd8111e_calc_coalesce(struct net_device *dev) |
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index 3fa3bccd1adb..10f3a196be32 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Amiga Linux/m68k Ariadne Ethernet Driver | 2 | * Amiga Linux/m68k Ariadne Ethernet Driver |
3 | * | 3 | * |
4 | * © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org) | 4 | * © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org) |
5 | * Peter De Schrijver (p2@mind.be) | 5 | * Peter De Schrijver (p2@mind.be) |
6 | * | 6 | * |
7 | * --------------------------------------------------------------------------- | 7 | * --------------------------------------------------------------------------- |
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h index f7913d5a39f1..bb613f292e04 100644 --- a/drivers/net/ariadne.h +++ b/drivers/net/ariadne.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Amiga Linux/m68k Ariadne Ethernet Driver | 2 | * Amiga Linux/m68k Ariadne Ethernet Driver |
3 | * | 3 | * |
4 | * © Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org) | 4 | * © Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org) |
5 | * Peter De Schrijver | 5 | * Peter De Schrijver |
6 | * (Peter.DeSchrijver@linux.cc.kuleuven.ac.be) | 6 | * (Peter.DeSchrijver@linux.cc.kuleuven.ac.be) |
7 | * | 7 | * |
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 185f98e3964c..504b7ce2747d 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
@@ -542,7 +542,7 @@ static struct { | |||
542 | static int num_ifs; | 542 | static int num_ifs; |
543 | 543 | ||
544 | /* | 544 | /* |
545 | * Setup the base address and interupt of the Au1xxx ethernet macs | 545 | * Setup the base address and interrupt of the Au1xxx ethernet macs |
546 | * based on cpu type and whether the interface is enabled in sys_pinfunc | 546 | * based on cpu type and whether the interface is enabled in sys_pinfunc |
547 | * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. | 547 | * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. |
548 | */ | 548 | */ |
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 80c0c8c415ed..855dc10ffa1b 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c | |||
@@ -55,7 +55,7 @@ static int expected_refcount = -1; | |||
55 | static struct class *netdev_class; | 55 | static struct class *netdev_class; |
56 | /*--------------------------- Data Structures -----------------------------*/ | 56 | /*--------------------------- Data Structures -----------------------------*/ |
57 | 57 | ||
58 | /* Bonding sysfs lock. Why can't we just use the subsytem lock? | 58 | /* Bonding sysfs lock. Why can't we just use the subsystem lock? |
59 | * Because kobject_register tries to acquire the subsystem lock. If | 59 | * Because kobject_register tries to acquire the subsystem lock. If |
60 | * we already hold the lock (which we would if the user was creating | 60 | * we already hold the lock (which we would if the user was creating |
61 | * a new bond through the sysfs interface), we deadlock. | 61 | * a new bond through the sysfs interface), we deadlock. |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 64f35e20fd48..3dbaec680b46 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1324,7 +1324,7 @@ static inline int e100_exec_cb_wait(struct nic *nic, struct sk_buff *skb, | |||
1324 | if (!--counter) break; | 1324 | if (!--counter) break; |
1325 | } | 1325 | } |
1326 | 1326 | ||
1327 | /* ack any interupts, something could have been set */ | 1327 | /* ack any interrupts, something could have been set */ |
1328 | iowrite8(~0, &nic->csr->scb.stat_ack); | 1328 | iowrite8(~0, &nic->csr->scb.stat_ack); |
1329 | 1329 | ||
1330 | /* if the command failed, or is not OK, notify and return */ | 1330 | /* if the command failed, or is not OK, notify and return */ |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 047263830e6a..f1ce348470cc 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -3590,7 +3590,7 @@ e1000_update_stats(struct e1000_adapter *adapter) | |||
3590 | 3590 | ||
3591 | spin_lock_irqsave(&adapter->stats_lock, flags); | 3591 | spin_lock_irqsave(&adapter->stats_lock, flags); |
3592 | 3592 | ||
3593 | /* these counters are modified from e1000_adjust_tbi_stats, | 3593 | /* these counters are modified from e1000_tbi_adjust_stats, |
3594 | * called from the interrupt context, so they must only | 3594 | * called from the interrupt context, so they must only |
3595 | * be written while holding adapter->stats_lock | 3595 | * be written while holding adapter->stats_lock |
3596 | */ | 3596 | */ |
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 43f7647ff246..7bb9c728a1d3 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -111,7 +111,6 @@ MODULE_AUTHOR("Myson or whoever"); | |||
111 | MODULE_DESCRIPTION("Myson MTD-8xx 100/10M Ethernet PCI Adapter Driver"); | 111 | MODULE_DESCRIPTION("Myson MTD-8xx 100/10M Ethernet PCI Adapter Driver"); |
112 | MODULE_LICENSE("GPL"); | 112 | MODULE_LICENSE("GPL"); |
113 | module_param(max_interrupt_work, int, 0); | 113 | module_param(max_interrupt_work, int, 0); |
114 | //MODULE_PARM(min_pci_latency, "i"); | ||
115 | module_param(debug, int, 0); | 114 | module_param(debug, int, 0); |
116 | module_param(rx_copybreak, int, 0); | 115 | module_param(rx_copybreak, int, 0); |
117 | module_param(multicast_filter_limit, int, 0); | 116 | module_param(multicast_filter_limit, int, 0); |
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index ad9e327c3b03..e0119f6a3319 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * devices like TTY. It interfaces between a raw TTY and the | 3 | * devices like TTY. It interfaces between a raw TTY and the |
4 | * kernel's AX.25 protocol layers. | 4 | * kernel's AX.25 protocol layers. |
5 | * | 5 | * |
6 | * Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de> | 6 | * Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de> |
7 | * Ralf Baechle DL5RB <ralf@linux-mips.org> | 7 | * Ralf Baechle DL5RB <ralf@linux-mips.org> |
8 | * | 8 | * |
9 | * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by | 9 | * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by |
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index 36d2c7d4f4d0..62d5d5cfd6a6 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig | |||
@@ -64,7 +64,7 @@ config DMASCC | |||
64 | dmascc. If you don't pass any parameter to the driver, all | 64 | dmascc. If you don't pass any parameter to the driver, all |
65 | possible I/O addresses are probed. This could irritate other devices | 65 | possible I/O addresses are probed. This could irritate other devices |
66 | that are currently not in use. You may specify the list of addresses | 66 | that are currently not in use. You may specify the list of addresses |
67 | to be probed by "dmascc=addr1,addr2,..." (when compiled into the | 67 | to be probed by "dmascc.io=addr1,addr2,..." (when compiled into the |
68 | kernel image) or "io=addr1,addr2,..." (when loaded as a module). The | 68 | kernel image) or "io=addr1,addr2,..." (when loaded as a module). The |
69 | network interfaces will be called dmascc0 and dmascc1 for the board | 69 | network interfaces will be called dmascc0 and dmascc1 for the board |
70 | detected first, dmascc2 and dmascc3 for the second one, and so on. | 70 | detected first, dmascc2 and dmascc3 for the second one, and so on. |
diff --git a/drivers/net/irda/actisys-sir.c b/drivers/net/irda/actisys-sir.c index ccf6ec548a64..736d2473b7e1 100644 --- a/drivers/net/irda/actisys-sir.c +++ b/drivers/net/irda/actisys-sir.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * published by the Free Software Foundation; either version 2 of | 21 | * published by the Free Software Foundation; either version 2 of |
22 | * the License, or (at your option) any later version. | 22 | * the License, or (at your option) any later version. |
23 | * | 23 | * |
24 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 24 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
25 | * provide warranty for any of this software. This material is | 25 | * provide warranty for any of this software. This material is |
26 | * provided "AS-IS" and at no charge. | 26 | * provided "AS-IS" and at no charge. |
27 | * | 27 | * |
diff --git a/drivers/net/irda/actisys.c b/drivers/net/irda/actisys.c index b2e31f4a384c..ae0b80a5680c 100644 --- a/drivers/net/irda/actisys.c +++ b/drivers/net/irda/actisys.c | |||
@@ -19,7 +19,7 @@ | |||
19 | * published by the Free Software Foundation; either version 2 of | 19 | * published by the Free Software Foundation; either version 2 of |
20 | * the License, or (at your option) any later version. | 20 | * the License, or (at your option) any later version. |
21 | * | 21 | * |
22 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 22 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
23 | * provide warranty for any of this software. This material is | 23 | * provide warranty for any of this software. This material is |
24 | * provided "AS-IS" and at no charge. | 24 | * provided "AS-IS" and at no charge. |
25 | * | 25 | * |
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index a82d8f98383d..1257e1a7e819 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c | |||
@@ -595,7 +595,7 @@ toshoboe_startchip (struct toshoboe_cb *self) | |||
595 | OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1); | 595 | OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1); |
596 | OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2); | 596 | OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2); |
597 | 597 | ||
598 | /*Enable DMA controler in byte mode and RX */ | 598 | /*Enable DMA controller in byte mode and RX */ |
599 | OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H); | 599 | OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H); |
600 | 600 | ||
601 | /* Start up the clocks */ | 601 | /* Start up the clocks */ |
diff --git a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c index 0d2fe87fb9b7..738531b16bd3 100644 --- a/drivers/net/irda/girbil-sir.c +++ b/drivers/net/irda/girbil-sir.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c index 248aeb0c726c..1f57391a618b 100644 --- a/drivers/net/irda/girbil.c +++ b/drivers/net/irda/girbil.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/drivers/net/irda/irport.h b/drivers/net/irda/irport.h index 3f46b84c6c85..66fc2433e97d 100644 --- a/drivers/net/irda/irport.h +++ b/drivers/net/irda/irport.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation; either version 2 of | 17 | * published by the Free Software Foundation; either version 2 of |
18 | * the License, or (at your option) any later version. | 18 | * the License, or (at your option) any later version. |
19 | * | 19 | * |
20 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 20 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
21 | * provide warranty for any of this software. This material is | 21 | * provide warranty for any of this software. This material is |
22 | * provided "AS-IS" and at no charge. | 22 | * provided "AS-IS" and at no charge. |
23 | * | 23 | * |
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c index 6f5f697ec9f8..2c6f7be36e8a 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/net/irda/irtty-sir.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 23 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
24 | * provide warranty for any of this software. This material is | 24 | * provide warranty for any of this software. This material is |
25 | * provided "AS-IS" and at no charge. | 25 | * provided "AS-IS" and at no charge. |
26 | * | 26 | * |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 12b9378c587f..a873d2b315ca 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 23 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
24 | * provide warranty for any of this software. This material is | 24 | * provide warranty for any of this software. This material is |
25 | * provided "AS-IS" and at no charge. | 25 | * provided "AS-IS" and at no charge. |
26 | * | 26 | * |
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h index dacf671abcd6..bbdc97ff83ca 100644 --- a/drivers/net/irda/nsc-ircc.h +++ b/drivers/net/irda/nsc-ircc.h | |||
@@ -19,7 +19,7 @@ | |||
19 | * published by the Free Software Foundation; either version 2 of | 19 | * published by the Free Software Foundation; either version 2 of |
20 | * the License, or (at your option) any later version. | 20 | * the License, or (at your option) any later version. |
21 | * | 21 | * |
22 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 22 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
23 | * provide warranty for any of this software. This material is | 23 | * provide warranty for any of this software. This material is |
24 | * provided "AS-IS" and at no charge. | 24 | * provided "AS-IS" and at no charge. |
25 | * | 25 | * |
diff --git a/drivers/net/irda/tekram-sir.c b/drivers/net/irda/tekram-sir.c index 0dd6bc7af3f2..d1ce5ae6a172 100644 --- a/drivers/net/irda/tekram-sir.c +++ b/drivers/net/irda/tekram-sir.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * published by the Free Software Foundation; either version 2 of | 18 | * published by the Free Software Foundation; either version 2 of |
19 | * the License, or (at your option) any later version. | 19 | * the License, or (at your option) any later version. |
20 | * | 20 | * |
21 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 21 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
22 | * provide warranty for any of this software. This material is | 22 | * provide warranty for any of this software. This material is |
23 | * provided "AS-IS" and at no charge. | 23 | * provided "AS-IS" and at no charge. |
24 | * | 24 | * |
diff --git a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c index 8f6258221cb0..9bfd2441adbf 100644 --- a/drivers/net/irda/tekram.c +++ b/drivers/net/irda/tekram.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/drivers/net/irda/w83977af_ir.h b/drivers/net/irda/w83977af_ir.h index 0b7661deafee..87c3975baf62 100644 --- a/drivers/net/irda/w83977af_ir.h +++ b/drivers/net/irda/w83977af_ir.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * published by the Free Software Foundation; either version 2 of | 16 | * published by the Free Software Foundation; either version 2 of |
17 | * the License, or (at your option) any later version. | 17 | * the License, or (at your option) any later version. |
18 | * | 18 | * |
19 | * Neither Dag Brattli nor University of Tromsø admit liability nor | 19 | * Neither Dag Brattli nor University of Tromsø admit liability nor |
20 | * provide warranty for any of this software. This material is | 20 | * provide warranty for any of this software. This material is |
21 | * provided "AS-IS" and at no charge. | 21 | * provided "AS-IS" and at no charge. |
22 | * | 22 | * |
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 50e1ec67ef9c..953117152bbd 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -996,7 +996,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
996 | a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that | 996 | a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that |
997 | made udelay() unreliable. | 997 | made udelay() unreliable. |
998 | The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is | 998 | The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is |
999 | depricated. | 999 | deprecated. |
1000 | */ | 1000 | */ |
1001 | #define eeprom_delay(ee_addr) readl(ee_addr) | 1001 | #define eeprom_delay(ee_addr) readl(ee_addr) |
1002 | 1002 | ||
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 7c60df46fc65..dd18af0ce676 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
@@ -1223,7 +1223,7 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id) | |||
1223 | } | 1223 | } |
1224 | #endif | 1224 | #endif |
1225 | 1225 | ||
1226 | /* Handle PHY interupt condition */ | 1226 | /* Handle PHY interrupt condition */ |
1227 | if (status & INT_STS_PHY_INT_) { | 1227 | if (status & INT_STS_PHY_INT_) { |
1228 | DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name); | 1228 | DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name); |
1229 | smc911x_phy_interrupt(dev); | 1229 | smc911x_phy_interrupt(dev); |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 571060a3c91e..bccae7e5c6ad 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -1639,7 +1639,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg) | |||
1639 | 1639 | ||
1640 | /** | 1640 | /** |
1641 | * spider_net_interrupt - interrupt handler for spider_net | 1641 | * spider_net_interrupt - interrupt handler for spider_net |
1642 | * @irq: interupt number | 1642 | * @irq: interrupt number |
1643 | * @ptr: pointer to net_device | 1643 | * @ptr: pointer to net_device |
1644 | * @regs: PU registers | 1644 | * @regs: PU registers |
1645 | * | 1645 | * |
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 8038f2882c9b..d887c05588d5 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -1654,7 +1654,7 @@ tc35815_rx(struct net_device *dev) | |||
1654 | panic_queues(dev); | 1654 | panic_queues(dev); |
1655 | } | 1655 | } |
1656 | #endif | 1656 | #endif |
1657 | /* pass BD to controler */ | 1657 | /* pass BD to controller */ |
1658 | #ifndef TC35815_USE_PACKEDBUFFER | 1658 | #ifndef TC35815_USE_PACKEDBUFFER |
1659 | if (!lp->rx_skbs[curid].skb) { | 1659 | if (!lp->rx_skbs[curid].skb) { |
1660 | lp->rx_skbs[curid].skb = | 1660 | lp->rx_skbs[curid].skb = |
@@ -1694,7 +1694,7 @@ tc35815_rx(struct net_device *dev) | |||
1694 | } | 1694 | } |
1695 | #endif | 1695 | #endif |
1696 | for (i = 0; i < (bd_count + 1) / 2 + 1; i++) { | 1696 | for (i = 0; i < (bd_count + 1) / 2 + 1; i++) { |
1697 | /* pass FD to controler */ | 1697 | /* pass FD to controller */ |
1698 | #ifdef DEBUG | 1698 | #ifdef DEBUG |
1699 | lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead); | 1699 | lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead); |
1700 | #else | 1700 | #else |
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 3c8e3b63be07..35d0cfcf8c47 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -483,7 +483,7 @@ err_out_netdev: | |||
483 | a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that | 483 | a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that |
484 | made udelay() unreliable. | 484 | made udelay() unreliable. |
485 | The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is | 485 | The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is |
486 | depricated. | 486 | deprecated. |
487 | */ | 487 | */ |
488 | #define eeprom_delay(ee_addr) ioread32(ee_addr) | 488 | #define eeprom_delay(ee_addr) ioread32(ee_addr) |
489 | 489 | ||
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 8dc09a3790cb..5a96d74e4ce8 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig | |||
@@ -71,7 +71,7 @@ config USB_PEGASUS | |||
71 | select MII | 71 | select MII |
72 | ---help--- | 72 | ---help--- |
73 | Say Y here if you know you have Pegasus or Pegasus-II based adapter. | 73 | Say Y here if you know you have Pegasus or Pegasus-II based adapter. |
74 | If in doubt then look at <file:drivers/usb/net/pegasus.h> for the | 74 | If in doubt then look at <file:drivers/net/usb/pegasus.h> for the |
75 | complete list of supported devices. | 75 | complete list of supported devices. |
76 | 76 | ||
77 | If your particular adapter is not in the list and you are _sure_ it | 77 | If your particular adapter is not in the list and you are _sure_ it |
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 4ae05799ac44..5c4a92de9a07 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -1648,7 +1648,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx) | |||
1648 | * | 1648 | * |
1649 | * Scan the queues looking for transmitted packets that | 1649 | * Scan the queues looking for transmitted packets that |
1650 | * we can complete and clean up. Update any statistics as | 1650 | * we can complete and clean up. Update any statistics as |
1651 | * neccessary/ | 1651 | * necessary/ |
1652 | */ | 1652 | */ |
1653 | 1653 | ||
1654 | static int velocity_tx_srv(struct velocity_info *vptr, u32 status) | 1654 | static int velocity_tx_srv(struct velocity_info *vptr, u32 status) |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h index 9ecf2bf0d25d..47c135a7f4dc 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h | |||
@@ -87,7 +87,7 @@ void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm, | |||
87 | 87 | ||
88 | /* RX header as received from the hardware. */ | 88 | /* RX header as received from the hardware. */ |
89 | struct bcm43xx_rxhdr { | 89 | struct bcm43xx_rxhdr { |
90 | /* Frame Length. Must be generated explicitely in PIO mode. */ | 90 | /* Frame Length. Must be generated explicitly in PIO mode. */ |
91 | __le16 frame_length; | 91 | __le16 frame_length; |
92 | PAD_BYTES(2); | 92 | PAD_BYTES(2); |
93 | /* Flags field 1 */ | 93 | /* Flags field 1 */ |
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 7a7797560a23..a6c7904de282 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
@@ -6047,7 +6047,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev, | |||
6047 | * ends up causing problems. So, we just handle | 6047 | * ends up causing problems. So, we just handle |
6048 | * the WX extensions through the ipw2100_ioctl interface */ | 6048 | * the WX extensions through the ipw2100_ioctl interface */ |
6049 | 6049 | ||
6050 | /* memset() puts everything to 0, so we only have explicitely set | 6050 | /* memset() puts everything to 0, so we only have explicitly set |
6051 | * those values that need to be something else */ | 6051 | * those values that need to be something else */ |
6052 | 6052 | ||
6053 | /* If power management is turned on, default to AUTO mode */ | 6053 | /* If power management is turned on, default to AUTO mode */ |
@@ -7509,7 +7509,7 @@ static int ipw2100_wx_set_power(struct net_device *dev, | |||
7509 | switch (wrqu->power.flags & IW_POWER_MODE) { | 7509 | switch (wrqu->power.flags & IW_POWER_MODE) { |
7510 | case IW_POWER_ON: /* If not specified */ | 7510 | case IW_POWER_ON: /* If not specified */ |
7511 | case IW_POWER_MODE: /* If set all mask */ | 7511 | case IW_POWER_MODE: /* If set all mask */ |
7512 | case IW_POWER_ALL_R: /* If explicitely state all */ | 7512 | case IW_POWER_ALL_R: /* If explicitly state all */ |
7513 | break; | 7513 | break; |
7514 | default: /* Otherwise we don't support it */ | 7514 | default: /* Otherwise we don't support it */ |
7515 | IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", | 7515 | IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index feb8fcbab2d5..e3c828401b9a 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -9603,7 +9603,7 @@ static int ipw_wx_set_power(struct net_device *dev, | |||
9603 | switch (wrqu->power.flags & IW_POWER_MODE) { | 9603 | switch (wrqu->power.flags & IW_POWER_MODE) { |
9604 | case IW_POWER_ON: /* If not specified */ | 9604 | case IW_POWER_ON: /* If not specified */ |
9605 | case IW_POWER_MODE: /* If set all mask */ | 9605 | case IW_POWER_MODE: /* If set all mask */ |
9606 | case IW_POWER_ALL_R: /* If explicitely state all */ | 9606 | case IW_POWER_ALL_R: /* If explicitly state all */ |
9607 | break; | 9607 | break; |
9608 | default: /* Otherwise we don't support it */ | 9608 | default: /* Otherwise we don't support it */ |
9609 | IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", | 9609 | IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", |
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index c2d71afd57e5..2402cb8dd328 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -4,18 +4,18 @@ | |||
4 | * Version: 0.4.1 | 4 | * Version: 0.4.1 |
5 | * Description: Netwave AirSurfer Wireless LAN PC Card driver | 5 | * Description: Netwave AirSurfer Wireless LAN PC Card driver |
6 | * Status: Experimental. | 6 | * Status: Experimental. |
7 | * Authors: John Markus Bjørndalen <johnm@cs.uit.no> | 7 | * Authors: John Markus Bjørndalen <johnm@cs.uit.no> |
8 | * Dag Brattli <dagb@cs.uit.no> | 8 | * Dag Brattli <dagb@cs.uit.no> |
9 | * David Hinds <dahinds@users.sourceforge.net> | 9 | * David Hinds <dahinds@users.sourceforge.net> |
10 | * Created at: A long time ago! | 10 | * Created at: A long time ago! |
11 | * Modified at: Mon Nov 10 11:54:37 1997 | 11 | * Modified at: Mon Nov 10 11:54:37 1997 |
12 | * Modified by: Dag Brattli <dagb@cs.uit.no> | 12 | * Modified by: Dag Brattli <dagb@cs.uit.no> |
13 | * | 13 | * |
14 | * Copyright (c) 1997 University of Tromsø, Norway | 14 | * Copyright (c) 1997 University of Tromsø, Norway |
15 | * | 15 | * |
16 | * Revision History: | 16 | * Revision History: |
17 | * | 17 | * |
18 | * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no> | 18 | * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no> |
19 | * - Fixed some bugs in netwave_rx and cleaned it up a bit. | 19 | * - Fixed some bugs in netwave_rx and cleaned it up a bit. |
20 | * (One of the bugs would have destroyed packets when receiving | 20 | * (One of the bugs would have destroyed packets when receiving |
21 | * multiple packets per interrupt). | 21 | * multiple packets per interrupt). |
@@ -158,7 +158,7 @@ static int pc_debug = PCMCIA_DEBUG; | |||
158 | module_param(pc_debug, int, 0); | 158 | module_param(pc_debug, int, 0); |
159 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | 159 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) |
160 | static char *version = | 160 | static char *version = |
161 | "netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; | 161 | "netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; |
162 | #else | 162 | #else |
163 | #define DEBUG(n, args...) | 163 | #define DEBUG(n, args...) |
164 | #endif | 164 | #endif |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 6420a90a4a92..cbde770eb121 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -240,7 +240,7 @@ config RTC_DRV_TWL92330 | |||
240 | depends on MENELAUS | 240 | depends on MENELAUS |
241 | help | 241 | help |
242 | If you say yes here you get support for the RTC on the | 242 | If you say yes here you get support for the RTC on the |
243 | TWL92330 "Menelaus" power mangement chip, used with OMAP2 | 243 | TWL92330 "Menelaus" power management chip, used with OMAP2 |
244 | platforms. The support is integrated with the rest of | 244 | platforms. The support is integrated with the rest of |
245 | the Menelaus driver; it's not separate module. | 245 | the Menelaus driver; it's not separate module. |
246 | 246 | ||
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index 8b9d68f6e016..5b7385e430ea 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c | |||
@@ -40,7 +40,7 @@ struct DCTL_data { | |||
40 | * | 40 | * |
41 | * Each bit configuration leading to an action code 2 (Exit with | 41 | * Each bit configuration leading to an action code 2 (Exit with |
42 | * programming error or unusual condition indication) | 42 | * programming error or unusual condition indication) |
43 | * are handled as fatal error´s. | 43 | * are handled as fatal errors. |
44 | * | 44 | * |
45 | * All other configurations are handled as recoverable errors. | 45 | * All other configurations are handled as recoverable errors. |
46 | * | 46 | * |
@@ -2001,7 +2001,7 @@ dasd_3990_erp_compound_code(struct dasd_ccw_req * erp, char *sense) | |||
2001 | switch (sense[28]) { | 2001 | switch (sense[28]) { |
2002 | case 0x17: | 2002 | case 0x17: |
2003 | /* issue a Diagnostic Control command with an | 2003 | /* issue a Diagnostic Control command with an |
2004 | * Inhibit Write subcommand and controler modifier */ | 2004 | * Inhibit Write subcommand and controller modifier */ |
2005 | erp = dasd_3990_erp_DCTL(erp, 0x20); | 2005 | erp = dasd_3990_erp_DCTL(erp, 0x20); |
2006 | break; | 2006 | break; |
2007 | 2007 | ||
diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c index 29fe2a5ec2fe..82a13d9fdfe4 100644 --- a/drivers/s390/char/sclp_cpi.c +++ b/drivers/s390/char/sclp_cpi.c | |||
@@ -157,7 +157,7 @@ cpi_prepare_req(void) | |||
157 | sclp_ascebc_str(evb->system_name, CPI_LENGTH_SYSTEM_NAME); | 157 | sclp_ascebc_str(evb->system_name, CPI_LENGTH_SYSTEM_NAME); |
158 | EBC_TOUPPER(evb->system_name, CPI_LENGTH_SYSTEM_NAME); | 158 | EBC_TOUPPER(evb->system_name, CPI_LENGTH_SYSTEM_NAME); |
159 | 159 | ||
160 | /* set sytem level */ | 160 | /* set system level */ |
161 | evb->system_level = LINUX_VERSION_CODE; | 161 | evb->system_level = LINUX_VERSION_CODE; |
162 | 162 | ||
163 | /* set sysplex name */ | 163 | /* set sysplex name */ |
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c index b960f66843e4..725b0dd14269 100644 --- a/drivers/s390/cio/cmf.c +++ b/drivers/s390/cio/cmf.c | |||
@@ -158,7 +158,7 @@ static inline u64 time_to_avg_nsec(u32 value, u32 count) | |||
158 | if (count == 0) | 158 | if (count == 0) |
159 | return 0; | 159 | return 0; |
160 | 160 | ||
161 | /* value comes in units of 128 µsec */ | 161 | /* value comes in units of 128 µsec */ |
162 | ret = time_to_nsec(value); | 162 | ret = time_to_nsec(value); |
163 | do_div(ret, count); | 163 | do_div(ret, count); |
164 | 164 | ||
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c index 449937233732..6bf3ebbe985a 100644 --- a/drivers/s390/net/ctcmain.c +++ b/drivers/s390/net/ctcmain.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation | 4 | * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation |
5 | * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com) | 5 | * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com) |
6 | * Fixes by : Jochen Röhrig (roehrig@de.ibm.com) | 6 | * Fixes by : Jochen Röhrig (roehrig@de.ibm.com) |
7 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 7 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> |
8 | Peter Tiedemann (ptiedem@de.ibm.com) | 8 | Peter Tiedemann (ptiedem@de.ibm.com) |
9 | * Driver Model stuff by : Cornelia Huck <cornelia.huck@de.ibm.com> | 9 | * Driver Model stuff by : Cornelia Huck <cornelia.huck@de.ibm.com> |
@@ -19,7 +19,7 @@ | |||
19 | * Dieter Wellerdiek (wel@de.ibm.com) | 19 | * Dieter Wellerdiek (wel@de.ibm.com) |
20 | * Martin Schwidefsky (schwidefsky@de.ibm.com) | 20 | * Martin Schwidefsky (schwidefsky@de.ibm.com) |
21 | * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) | 21 | * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) |
22 | * Jochen Röhrig (roehrig@de.ibm.com) | 22 | * Jochen Röhrig (roehrig@de.ibm.com) |
23 | * | 23 | * |
24 | * This program is free software; you can redistribute it and/or modify | 24 | * This program is free software; you can redistribute it and/or modify |
25 | * it under the terms of the GNU General Public License as published by | 25 | * it under the terms of the GNU General Public License as published by |
@@ -885,7 +885,7 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg) | |||
885 | } | 885 | } |
886 | 886 | ||
887 | /** | 887 | /** |
888 | * Don´t setup a timer for receiving the initial RX frame | 888 | * Don't setup a timer for receiving the initial RX frame |
889 | * if in compatibility mode, since VM TCP delays the initial | 889 | * if in compatibility mode, since VM TCP delays the initial |
890 | * frame until it has some data to send. | 890 | * frame until it has some data to send. |
891 | */ | 891 | */ |
@@ -905,10 +905,10 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg) | |||
905 | ccw_check_return_code(ch, rc, "init IO"); | 905 | ccw_check_return_code(ch, rc, "init IO"); |
906 | } | 906 | } |
907 | /** | 907 | /** |
908 | * If in compatibility mode since we don´t setup a timer, we | 908 | * If in compatibility mode since we don't setup a timer, we |
909 | * also signal RX channel up immediately. This enables us | 909 | * also signal RX channel up immediately. This enables us |
910 | * to send packets early which in turn usually triggers some | 910 | * to send packets early which in turn usually triggers some |
911 | * reply from VM TCP which brings up the RX channel to it´s | 911 | * reply from VM TCP which brings up the RX channel to it's |
912 | * final state. | 912 | * final state. |
913 | */ | 913 | */ |
914 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && | 914 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && |
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 03b51025a8f4..9abba8b90f70 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h | |||
@@ -1526,7 +1526,7 @@ struct aac_mntent { | |||
1526 | __le32 capacityhigh; | 1526 | __le32 capacityhigh; |
1527 | }; | 1527 | }; |
1528 | 1528 | ||
1529 | #define FSCS_NOTCLEAN 0x0001 /* fsck is neccessary before mounting */ | 1529 | #define FSCS_NOTCLEAN 0x0001 /* fsck is necessary before mounting */ |
1530 | #define FSCS_READONLY 0x0002 /* possible result of broken mirror */ | 1530 | #define FSCS_READONLY 0x0002 /* possible result of broken mirror */ |
1531 | #define FSCS_HIDDEN 0x0004 /* should be ignored - set during a clear */ | 1531 | #define FSCS_HIDDEN 0x0004 /* should be ignored - set during a clear */ |
1532 | 1532 | ||
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index f08e71e0205a..a58c265dc8af 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* aha152x.c -- Adaptec AHA-152x driver | 1 | /* aha152x.c -- Adaptec AHA-152x driver |
2 | * Author: Jürgen E. Fischer, fischer@norbit.de | 2 | * Author: Jürgen E. Fischer, fischer@norbit.de |
3 | * Copyright 1993-2004 Jürgen E. Fischer | 3 | * Copyright 1993-2004 Jürgen E. Fischer |
4 | * | 4 | * |
5 | * This program is free software; you can redistribute it and/or modify it | 5 | * This program is free software; you can redistribute it and/or modify it |
6 | * under the terms of the GNU General Public License as published by the | 6 | * under the terms of the GNU General Public License as published by the |
@@ -357,7 +357,7 @@ enum { | |||
357 | check_condition = 0x0800, /* requesting sense after CHECK CONDITION */ | 357 | check_condition = 0x0800, /* requesting sense after CHECK CONDITION */ |
358 | }; | 358 | }; |
359 | 359 | ||
360 | MODULE_AUTHOR("Jürgen Fischer"); | 360 | MODULE_AUTHOR("Jürgen Fischer"); |
361 | MODULE_DESCRIPTION(AHA152X_REVID); | 361 | MODULE_DESCRIPTION(AHA152X_REVID); |
362 | MODULE_LICENSE("GPL"); | 362 | MODULE_LICENSE("GPL"); |
363 | 363 | ||
diff --git a/drivers/scsi/aic7xxx/cam.h b/drivers/scsi/aic7xxx/cam.h index 26f17e3fc45c..687aef6ef185 100644 --- a/drivers/scsi/aic7xxx/cam.h +++ b/drivers/scsi/aic7xxx/cam.h | |||
@@ -48,7 +48,7 @@ typedef enum { | |||
48 | CAM_REQ_ABORTED, /* CCB request aborted by the host */ | 48 | CAM_REQ_ABORTED, /* CCB request aborted by the host */ |
49 | CAM_UA_ABORT, /* Unable to abort CCB request */ | 49 | CAM_UA_ABORT, /* Unable to abort CCB request */ |
50 | CAM_REQ_CMP_ERR, /* CCB request completed with an error */ | 50 | CAM_REQ_CMP_ERR, /* CCB request completed with an error */ |
51 | CAM_BUSY, /* CAM subsytem is busy */ | 51 | CAM_BUSY, /* CAM subsystem is busy */ |
52 | CAM_REQ_INVALID, /* CCB request was invalid */ | 52 | CAM_REQ_INVALID, /* CCB request was invalid */ |
53 | CAM_PATH_INVALID, /* Supplied Path ID is invalid */ | 53 | CAM_PATH_INVALID, /* Supplied Path ID is invalid */ |
54 | CAM_SEL_TIMEOUT, /* Target Selection Timeout */ | 54 | CAM_SEL_TIMEOUT, /* Target Selection Timeout */ |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index fd42d4789202..a9def6e1d30e 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -1808,12 +1808,12 @@ static irqreturn_t dc395x_interrupt(int irq, void *dev_id) | |||
1808 | irqreturn_t handled = IRQ_NONE; | 1808 | irqreturn_t handled = IRQ_NONE; |
1809 | 1809 | ||
1810 | /* | 1810 | /* |
1811 | * Check for pending interupt | 1811 | * Check for pending interrupt |
1812 | */ | 1812 | */ |
1813 | scsi_status = DC395x_read16(acb, TRM_S1040_SCSI_STATUS); | 1813 | scsi_status = DC395x_read16(acb, TRM_S1040_SCSI_STATUS); |
1814 | dma_status = DC395x_read8(acb, TRM_S1040_DMA_STATUS); | 1814 | dma_status = DC395x_read8(acb, TRM_S1040_DMA_STATUS); |
1815 | if (scsi_status & SCSIINTERRUPT) { | 1815 | if (scsi_status & SCSIINTERRUPT) { |
1816 | /* interupt pending - let's process it! */ | 1816 | /* interrupt pending - let's process it! */ |
1817 | dc395x_handle_interrupt(acb, scsi_status); | 1817 | dc395x_handle_interrupt(acb, scsi_status); |
1818 | handled = IRQ_HANDLED; | 1818 | handled = IRQ_HANDLED; |
1819 | } | 1819 | } |
@@ -4579,7 +4579,7 @@ static void adapter_uninit_chip(struct AdapterCtlBlk *acb) | |||
4579 | if (acb->config & HCC_SCSI_RESET) | 4579 | if (acb->config & HCC_SCSI_RESET) |
4580 | reset_scsi_bus(acb); | 4580 | reset_scsi_bus(acb); |
4581 | 4581 | ||
4582 | /* clear any pending interupt state */ | 4582 | /* clear any pending interrupt state */ |
4583 | DC395x_read8(acb, TRM_S1040_SCSI_INTSTATUS); | 4583 | DC395x_read8(acb, TRM_S1040_SCSI_INTSTATUS); |
4584 | } | 4584 | } |
4585 | 4585 | ||
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index e4e4c6a39ed6..78779209ac89 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -427,7 +427,7 @@ megaraid_exit(void) | |||
427 | * @id : pci device id of the class of controllers | 427 | * @id : pci device id of the class of controllers |
428 | * | 428 | * |
429 | * This routine should be called whenever a new adapter is detected by the | 429 | * This routine should be called whenever a new adapter is detected by the |
430 | * PCI hotplug susbsytem. | 430 | * PCI hotplug susbsystem. |
431 | */ | 431 | */ |
432 | static int __devinit | 432 | static int __devinit |
433 | megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | 433 | megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) |
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c index 1e29f51d596b..d692c713416a 100644 --- a/drivers/scsi/qla4xxx/ql4_init.c +++ b/drivers/scsi/qla4xxx/ql4_init.c | |||
@@ -1006,7 +1006,7 @@ int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a) | |||
1006 | * qla4xxx_start_firmware - starts qla4xxx firmware | 1006 | * qla4xxx_start_firmware - starts qla4xxx firmware |
1007 | * @ha: Pointer to host adapter structure. | 1007 | * @ha: Pointer to host adapter structure. |
1008 | * | 1008 | * |
1009 | * This routine performs the neccessary steps to start the firmware for | 1009 | * This routine performs the necessary steps to start the firmware for |
1010 | * the QLA4010 adapter. | 1010 | * the QLA4010 adapter. |
1011 | **/ | 1011 | **/ |
1012 | static int qla4xxx_start_firmware(struct scsi_qla_host *ha) | 1012 | static int qla4xxx_start_firmware(struct scsi_qla_host *ha) |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 69f542c4923c..a69b155f39a2 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -676,7 +676,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo) | |||
676 | * success as well). Returns a negated errno value in case of error. | 676 | * success as well). Returns a negated errno value in case of error. |
677 | * | 677 | * |
678 | * Note: most ioctls are forward onto the block subsystem or further | 678 | * Note: most ioctls are forward onto the block subsystem or further |
679 | * down in the scsi subsytem. | 679 | * down in the scsi subsystem. |
680 | **/ | 680 | **/ |
681 | static int sd_ioctl(struct inode * inode, struct file * filp, | 681 | static int sd_ioctl(struct inode * inode, struct file * filp, |
682 | unsigned int cmd, unsigned long arg) | 682 | unsigned int cmd, unsigned long arg) |
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c index dc15a22105f7..4aafe89b557f 100644 --- a/drivers/scsi/sun3_NCR5380.c +++ b/drivers/scsi/sun3_NCR5380.c | |||
@@ -1596,7 +1596,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd, | |||
1596 | * IO while SEL is true. But again, there are some disks out the in the | 1596 | * IO while SEL is true. But again, there are some disks out the in the |
1597 | * world that do that nevertheless. (Somebody claimed that this announces | 1597 | * world that do that nevertheless. (Somebody claimed that this announces |
1598 | * reselection capability of the target.) So we better skip that test and | 1598 | * reselection capability of the target.) So we better skip that test and |
1599 | * only wait for BSY... (Famous german words: Der Klügere gibt nach :-) | 1599 | * only wait for BSY... (Famous german words: Der Klügere gibt nach :-) |
1600 | */ | 1600 | */ |
1601 | 1601 | ||
1602 | while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & | 1602 | while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & |
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw2.h b/drivers/scsi/sym53c8xx_2/sym_fw2.h index 6e5b952312e3..ae1fb179b88e 100644 --- a/drivers/scsi/sym53c8xx_2/sym_fw2.h +++ b/drivers/scsi/sym53c8xx_2/sym_fw2.h | |||
@@ -1781,7 +1781,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = { | |||
1781 | * While testing with bogus QUANTUM drives, the C1010 | 1781 | * While testing with bogus QUANTUM drives, the C1010 |
1782 | * sometimes raised a spurious phase mismatch with | 1782 | * sometimes raised a spurious phase mismatch with |
1783 | * WSR and the CHMOV(1) triggered another PM. | 1783 | * WSR and the CHMOV(1) triggered another PM. |
1784 | * Waiting explicitely for the PHASE seemed to avoid | 1784 | * Waiting explicitly for the PHASE seemed to avoid |
1785 | * the nested phase mismatch. Btw, this didn't happen | 1785 | * the nested phase mismatch. Btw, this didn't happen |
1786 | * using my IBM drives. | 1786 | * using my IBM drives. |
1787 | */ | 1787 | */ |
diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h index 61ffb860dacc..00123f2383d7 100644 --- a/drivers/scsi/wd33c93.h +++ b/drivers/scsi/wd33c93.h | |||
@@ -155,7 +155,7 @@ | |||
155 | #define WD33C93_FS_12_15 OWNID_FS_12 | 155 | #define WD33C93_FS_12_15 OWNID_FS_12 |
156 | #define WD33C93_FS_16_20 OWNID_FS_16 | 156 | #define WD33C93_FS_16_20 OWNID_FS_16 |
157 | 157 | ||
158 | /* pass input-clock explicitely. accepted mhz values are 8-10,12-20 */ | 158 | /* pass input-clock explicitly. accepted mhz values are 8-10,12-20 */ |
159 | #define WD33C93_FS_MHZ(mhz) (mhz) | 159 | #define WD33C93_FS_MHZ(mhz) (mhz) |
160 | 160 | ||
161 | /* Control register */ | 161 | /* Control register */ |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index d6ae38e55d01..87665d7df6f2 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -62,11 +62,11 @@ config SERIAL_8250_CONSOLE | |||
62 | kernel will automatically use the first serial line, /dev/ttyS0, as | 62 | kernel will automatically use the first serial line, /dev/ttyS0, as |
63 | system console. | 63 | system console. |
64 | 64 | ||
65 | you can set that using a kernel command line option such as | 65 | You can set that using a kernel command line option such as |
66 | "console=uart8250,io,0x3f8,9600n8" | 66 | "console=uart8250,io,0x3f8,9600n8" |
67 | "console=uart8250,mmio,0xff5e0000,115200n8". | 67 | "console=uart8250,mmio,0xff5e0000,115200n8". |
68 | and it will switch to normal serial console when correponding port is | 68 | and it will switch to normal serial console when the corresponding |
69 | ready. | 69 | port is ready. |
70 | "earlycon=uart8250,io,0x3f8,9600n8" | 70 | "earlycon=uart8250,io,0x3f8,9600n8" |
71 | "earlycon=uart8250,mmio,0xff5e0000,115200n8". | 71 | "earlycon=uart8250,mmio,0xff5e0000,115200n8". |
72 | it will not only setup early console. | 72 | it will not only setup early console. |
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index 3f26c4b2f322..e773c8e14962 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
@@ -20,8 +20,8 @@ | |||
20 | * - S3C2410 and S3C2440 serial support | 20 | * - S3C2410 and S3C2440 serial support |
21 | * - Power Management support | 21 | * - Power Management support |
22 | * - Fix console via IrDA devices | 22 | * - Fix console via IrDA devices |
23 | * - SysReq (Herbert Pötzl) | 23 | * - SysReq (Herbert Pötzl) |
24 | * - Break character handling (Herbert Pötzl) | 24 | * - Break character handling (Herbert Pötzl) |
25 | * - spin-lock initialisation (Dimitry Andric) | 25 | * - spin-lock initialisation (Dimitry Andric) |
26 | * - added clock control | 26 | * - added clock control |
27 | * - updated init code to use platform_device info | 27 | * - updated init code to use platform_device info |
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c index e9aba932f217..7051e6c5edc3 100644 --- a/drivers/spi/mpc52xx_psc_spi.c +++ b/drivers/spi/mpc52xx_psc_spi.c | |||
@@ -181,7 +181,7 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi, | |||
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
184 | /* enable interupts and wait for wake up | 184 | /* enable interrupts and wait for wake up |
185 | * if just one byte is expected the Rx FIFO genererates no | 185 | * if just one byte is expected the Rx FIFO genererates no |
186 | * FFULL interrupt, so activate the RxRDY interrupt | 186 | * FFULL interrupt, so activate the RxRDY interrupt |
187 | */ | 187 | */ |
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index e78c2ddc1f88..367b75c0b25b 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
@@ -1272,7 +1272,7 @@ static int lh7a40x_set_halt(struct usb_ep *_ep, int value) | |||
1272 | /* | 1272 | /* |
1273 | * Attempts to halt IN endpoints will fail (returning -EAGAIN) | 1273 | * Attempts to halt IN endpoints will fail (returning -EAGAIN) |
1274 | * if any transfer requests are still queued, or if the controller | 1274 | * if any transfer requests are still queued, or if the controller |
1275 | * FIFO still holds bytes that the host hasn’t collected. | 1275 | * FIFO still holds bytes that the host hasn't collected. |
1276 | */ | 1276 | */ |
1277 | spin_unlock_irqrestore(&ep->dev->lock, flags); | 1277 | spin_unlock_irqrestore(&ep->dev->lock, flags); |
1278 | DEBUG | 1278 | DEBUG |
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 0dcb4164dc83..735db4aec831 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c | |||
@@ -451,7 +451,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf) | |||
451 | 451 | ||
452 | /* Some boards (mostly VIA?) report bogus overcurrent indications, | 452 | /* Some boards (mostly VIA?) report bogus overcurrent indications, |
453 | * causing massive log spam unless we completely ignore them. It | 453 | * causing massive log spam unless we completely ignore them. It |
454 | * may be relevant that VIA VT8235 controlers, where PORT_POWER is | 454 | * may be relevant that VIA VT8235 controllers, where PORT_POWER is |
455 | * always set, seem to clear PORT_OCC and PORT_CSC when writing to | 455 | * always set, seem to clear PORT_OCC and PORT_CSC when writing to |
456 | * PORT_POWER; that's surprising, but maybe within-spec. | 456 | * PORT_POWER; that's surprising, but maybe within-spec. |
457 | */ | 457 | */ |
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 94d859aa73f8..ba370c56172c 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
@@ -1556,7 +1556,7 @@ sl811h_start(struct usb_hcd *hcd) | |||
1556 | hcd->power_budget = sl811->board->power * 2; | 1556 | hcd->power_budget = sl811->board->power * 2; |
1557 | } | 1557 | } |
1558 | 1558 | ||
1559 | /* enable power and interupts */ | 1559 | /* enable power and interrupts */ |
1560 | port_power(sl811, 1); | 1560 | port_power(sl811, 1); |
1561 | 1561 | ||
1562 | return 0; | 1562 | return 0; |
diff --git a/drivers/usb/image/Kconfig b/drivers/usb/image/Kconfig index 95ce703110d2..7595dfb38e3b 100644 --- a/drivers/usb/image/Kconfig +++ b/drivers/usb/image/Kconfig | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # USB Imageing devices configuration | 2 | # USB Imaging devices configuration |
3 | # | 3 | # |
4 | comment "USB Imaging devices" | 4 | comment "USB Imaging devices" |
5 | depends on USB | 5 | depends on USB |
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c index 04e87acd6e46..2677fea147d9 100644 --- a/drivers/usb/misc/cytherm.c +++ b/drivers/usb/misc/cytherm.c | |||
@@ -118,7 +118,7 @@ static ssize_t set_brightness(struct device *dev, struct device_attribute *attr, | |||
118 | cytherm->brightness, buffer, 8); | 118 | cytherm->brightness, buffer, 8); |
119 | if (retval) | 119 | if (retval) |
120 | dev_dbg(&cytherm->udev->dev, "retval = %d\n", retval); | 120 | dev_dbg(&cytherm->udev->dev, "retval = %d\n", retval); |
121 | /* Inform µC that we have changed the brightness setting */ | 121 | /* Inform µC that we have changed the brightness setting */ |
122 | retval = vendor_command(cytherm->udev, WRITE_RAM, BRIGHTNESS_SEM, | 122 | retval = vendor_command(cytherm->udev, WRITE_RAM, BRIGHTNESS_SEM, |
123 | 0x01, buffer, 8); | 123 | 0x01, buffer, 8); |
124 | if (retval) | 124 | if (retval) |
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c index 5c0a26cbd128..cd137577bb2d 100644 --- a/drivers/usb/misc/emi26.c +++ b/drivers/usb/misc/emi26.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Emagic EMI 2|6 usb audio interface firmware loader. | 2 | * Emagic EMI 2|6 usb audio interface firmware loader. |
3 | * Copyright (C) 2002 | 3 | * Copyright (C) 2002 |
4 | * Tapio Laxström (tapio.laxstrom@iptime.fi) | 4 | * Tapio Laxström (tapio.laxstrom@iptime.fi) |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License, as published by | 7 | * it under the terms of the GNU General Public License, as published by |
@@ -249,7 +249,7 @@ static void __exit emi26_exit (void) | |||
249 | module_init(emi26_init); | 249 | module_init(emi26_init); |
250 | module_exit(emi26_exit); | 250 | module_exit(emi26_exit); |
251 | 251 | ||
252 | MODULE_AUTHOR("tapio laxström"); | 252 | MODULE_AUTHOR("Tapio Laxström"); |
253 | MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader."); | 253 | MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader."); |
254 | MODULE_LICENSE("GPL"); | 254 | MODULE_LICENSE("GPL"); |
255 | 255 | ||
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c index 23153eac0dfa..4758cc5ccebc 100644 --- a/drivers/usb/misc/emi62.c +++ b/drivers/usb/misc/emi62.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Emagic EMI 2|6 usb audio interface firmware loader. | 2 | * Emagic EMI 2|6 usb audio interface firmware loader. |
3 | * Copyright (C) 2002 | 3 | * Copyright (C) 2002 |
4 | * Tapio Laxström (tapio.laxstrom@iptime.fi) | 4 | * Tapio Laxström (tapio.laxstrom@iptime.fi) |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License, as published by | 7 | * it under the terms of the GNU General Public License, as published by |
@@ -292,7 +292,7 @@ static void __exit emi62_exit (void) | |||
292 | module_init(emi62_init); | 292 | module_init(emi62_init); |
293 | module_exit(emi62_exit); | 293 | module_exit(emi62_exit); |
294 | 294 | ||
295 | MODULE_AUTHOR("tapio laxström"); | 295 | MODULE_AUTHOR("Tapio Laxström"); |
296 | MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader."); | 296 | MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader."); |
297 | MODULE_LICENSE("GPL"); | 297 | MODULE_LICENSE("GPL"); |
298 | 298 | ||
diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history index 52c4f7bd7a80..c1b279939bbf 100644 --- a/drivers/usb/serial/ChangeLog.history +++ b/drivers/usb/serial/ChangeLog.history | |||
@@ -400,7 +400,7 @@ visor.c Change Log comments: | |||
400 | 400 | ||
401 | (11/11/2001) gkh | 401 | (11/11/2001) gkh |
402 | Added support for the m125 devices, and added check to prevent oopses | 402 | Added support for the m125 devices, and added check to prevent oopses |
403 | for Clié devices that lie about the number of ports they have. | 403 | for Clié devices that lie about the number of ports they have. |
404 | 404 | ||
405 | (08/30/2001) gkh | 405 | (08/30/2001) gkh |
406 | Added support for the Clie devices, both the 3.5 and 4.0 os versions. | 406 | Added support for the Clie devices, both the 3.5 and 4.0 os versions. |
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index 99fefed77919..4a86696e6c7d 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
@@ -527,7 +527,7 @@ config USB_SERIAL_CYBERJACK | |||
527 | depends on USB_SERIAL && EXPERIMENTAL | 527 | depends on USB_SERIAL && EXPERIMENTAL |
528 | ---help--- | 528 | ---help--- |
529 | Say Y here if you want to use a cyberJack pinpad/e-com USB chipcard | 529 | Say Y here if you want to use a cyberJack pinpad/e-com USB chipcard |
530 | reader. This is an interface to ISO 7816 compatible contactbased | 530 | reader. This is an interface to ISO 7816 compatible contact-based |
531 | chipcards, e.g. GSM SIMs. | 531 | chipcards, e.g. GSM SIMs. |
532 | 532 | ||
533 | To compile this driver as a module, choose M here: the | 533 | To compile this driver as a module, choose M here: the |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 65257867b34b..8a8a6b9fb05b 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -83,7 +83,7 @@ | |||
83 | * | 83 | * |
84 | * (18/Jun/2003) Ian Abbott | 84 | * (18/Jun/2003) Ian Abbott |
85 | * Added Device ID of the USB relais from Rudolf Gugler (backported from | 85 | * Added Device ID of the USB relais from Rudolf Gugler (backported from |
86 | * Philipp Gühring's patch for 2.5.x kernel). | 86 | * Philipp Gühring's patch for 2.5.x kernel). |
87 | * Moved read transfer buffer reallocation into startup function. | 87 | * Moved read transfer buffer reallocation into startup function. |
88 | * Free existing write urb and transfer buffer in startup function. | 88 | * Free existing write urb and transfer buffer in startup function. |
89 | * Only use urbs in write urb pool that were successfully allocated. | 89 | * Only use urbs in write urb pool that were successfully allocated. |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index b57b90ae9f9d..b51cbb0eaa05 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the | 17 | * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the |
18 | * FTDI_SIO implementation. | 18 | * FTDI_SIO implementation. |
19 | * | 19 | * |
20 | * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais | 20 | * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais |
21 | * from Rudolf Gugler | 21 | * from Rudolf Gugler |
22 | * | 22 | * |
23 | */ | 23 | */ |
@@ -44,7 +44,7 @@ | |||
44 | #define FTDI_ACTZWAVE_PID 0xF2D0 | 44 | #define FTDI_ACTZWAVE_PID 0xF2D0 |
45 | 45 | ||
46 | 46 | ||
47 | /* www.starting-point-systems.com µChameleon device */ | 47 | /* www.starting-point-systems.com µChameleon device */ |
48 | #define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ | 48 | #define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ |
49 | 49 | ||
50 | /* www.irtrans.de device */ | 50 | /* www.irtrans.de device */ |
@@ -419,7 +419,7 @@ | |||
419 | 419 | ||
420 | /* | 420 | /* |
421 | * Teratronik product ids. | 421 | * Teratronik product ids. |
422 | * Submitted by O. Wölfelschneider. | 422 | * Submitted by O. Wölfelschneider. |
423 | */ | 423 | */ |
424 | #define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ | 424 | #define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ |
425 | #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ | 425 | #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ |
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index e836ad07fdb9..9b38a08ac83a 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
@@ -306,7 +306,7 @@ static struct usb_device_id ipaq_id_table [] = { | |||
306 | { USB_DEVICE(0x0930, 0x0705) }, /* TOSHIBA Pocket PC e310 */ | 306 | { USB_DEVICE(0x0930, 0x0705) }, /* TOSHIBA Pocket PC e310 */ |
307 | { USB_DEVICE(0x0930, 0x0706) }, /* TOSHIBA Pocket PC e740 */ | 307 | { USB_DEVICE(0x0930, 0x0706) }, /* TOSHIBA Pocket PC e740 */ |
308 | { USB_DEVICE(0x0930, 0x0707) }, /* TOSHIBA Pocket PC e330 Series */ | 308 | { USB_DEVICE(0x0930, 0x0707) }, /* TOSHIBA Pocket PC e330 Series */ |
309 | { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350 Series */ | 309 | { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350 Series */ |
310 | { USB_DEVICE(0x0930, 0x0709) }, /* TOSHIBA Pocket PC e750 Series */ | 310 | { USB_DEVICE(0x0930, 0x0709) }, /* TOSHIBA Pocket PC e750 Series */ |
311 | { USB_DEVICE(0x0930, 0x070A) }, /* TOSHIBA Pocket PC e400 Series */ | 311 | { USB_DEVICE(0x0930, 0x070A) }, /* TOSHIBA Pocket PC e400 Series */ |
312 | { USB_DEVICE(0x0930, 0x070B) }, /* TOSHIBA Pocket PC e800 Series */ | 312 | { USB_DEVICE(0x0930, 0x070B) }, /* TOSHIBA Pocket PC e800 Series */ |
@@ -488,7 +488,7 @@ static struct usb_device_id ipaq_id_table [] = { | |||
488 | { USB_DEVICE(0x0BF8, 0x1001) }, /* Fujitsu Siemens Computers USB Sync */ | 488 | { USB_DEVICE(0x0BF8, 0x1001) }, /* Fujitsu Siemens Computers USB Sync */ |
489 | { USB_DEVICE(0x0C44, 0x03A2) }, /* Motorola iDEN Smartphone */ | 489 | { USB_DEVICE(0x0C44, 0x03A2) }, /* Motorola iDEN Smartphone */ |
490 | { USB_DEVICE(0x0C8E, 0x6000) }, /* Cesscom Luxian Series */ | 490 | { USB_DEVICE(0x0C8E, 0x6000) }, /* Cesscom Luxian Series */ |
491 | { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PC Device */ | 491 | { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PC Device */ |
492 | { USB_DEVICE(0x0F4E, 0x0200) }, /* Freedom Scientific USB Sync */ | 492 | { USB_DEVICE(0x0F4E, 0x0200) }, /* Freedom Scientific USB Sync */ |
493 | { USB_DEVICE(0x0F98, 0x0201) }, /* Cyberbank USB Sync */ | 493 | { USB_DEVICE(0x0F98, 0x0201) }, /* Cyberbank USB Sync */ |
494 | { USB_DEVICE(0x0FB8, 0x3001) }, /* Wistron USB Sync */ | 494 | { USB_DEVICE(0x0FB8, 0x3001) }, /* Wistron USB Sync */ |
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c index 6831dca93c1b..93a7724e167a 100644 --- a/drivers/usb/storage/isd200.c +++ b/drivers/usb/storage/isd200.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $ | 3 | * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $ |
4 | * | 4 | * |
5 | * Current development and maintenance: | 5 | * Current development and maintenance: |
6 | * (C) 2001-2002 Björn Stenberg (bjorn@haxx.se) | 6 | * (C) 2001-2002 Björn Stenberg (bjorn@haxx.se) |
7 | * | 7 | * |
8 | * Developed with the assistance of: | 8 | * Developed with the assistance of: |
9 | * (C) 2002 Alan Stern <stern@rowland.org> | 9 | * (C) 2002 Alan Stern <stern@rowland.org> |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 9b656ec427d0..22ab2380367d 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
@@ -407,7 +407,7 @@ UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210, | |||
407 | "FinePix 1400Zoom", | 407 | "FinePix 1400Zoom", |
408 | US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN), | 408 | US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN), |
409 | 409 | ||
410 | /* Reported by Peter Wächtler <pwaechtler@loewe-komp.de> | 410 | /* Reported by Peter Wächtler <pwaechtler@loewe-komp.de> |
411 | * The device needs the flags only. | 411 | * The device needs the flags only. |
412 | */ | 412 | */ |
413 | UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074, | 413 | UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074, |
@@ -1551,7 +1551,7 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999, | |||
1551 | US_FL_GO_SLOW ), | 1551 | US_FL_GO_SLOW ), |
1552 | 1552 | ||
1553 | /* | 1553 | /* |
1554 | * David Härdeman <david@2gen.com> | 1554 | * David Härdeman <david@2gen.com> |
1555 | * The key makes the SCSI stack print confusing (but harmless) messages | 1555 | * The key makes the SCSI stack print confusing (but harmless) messages |
1556 | */ | 1556 | */ |
1557 | UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, | 1557 | UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index b3bf4ecc983a..fb9d8d0b2c04 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -661,7 +661,7 @@ config FB_HECUBA | |||
661 | help | 661 | help |
662 | This enables support for the Hecuba board. This driver was tested | 662 | This enables support for the Hecuba board. This driver was tested |
663 | with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO | 663 | with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO |
664 | interface (8 bit data, 4 bit control). If you anticpate using | 664 | interface (8 bit data, 4 bit control). If you anticipate using |
665 | this driver, say Y or M; otherwise say N. You must specify the | 665 | this driver, say Y or M; otherwise say N. You must specify the |
666 | GPIO IO address to be used for setting control and data. | 666 | GPIO IO address to be used for setting control and data. |
667 | 667 | ||
@@ -815,7 +815,7 @@ config FB_XVR500 | |||
815 | help | 815 | help |
816 | This is the framebuffer device for the Sun XVR-500 and similar | 816 | This is the framebuffer device for the Sun XVR-500 and similar |
817 | graphics cards based upon the 3DLABS Wildcat chipset. The driver | 817 | graphics cards based upon the 3DLABS Wildcat chipset. The driver |
818 | only works on sparc64 systems where the system firwmare has | 818 | only works on sparc64 systems where the system firmware has |
819 | mostly initialized the card already. It is treated as a | 819 | mostly initialized the card already. It is treated as a |
820 | completely dumb framebuffer device. | 820 | completely dumb framebuffer device. |
821 | 821 | ||
@@ -828,7 +828,7 @@ config FB_XVR2500 | |||
828 | help | 828 | help |
829 | This is the framebuffer device for the Sun XVR-2500 and similar | 829 | This is the framebuffer device for the Sun XVR-2500 and similar |
830 | graphics cards based upon the 3DLABS Wildcat chipset. The driver | 830 | graphics cards based upon the 3DLABS Wildcat chipset. The driver |
831 | only works on sparc64 systems where the system firwmare has | 831 | only works on sparc64 systems where the system firmware has |
832 | mostly initialized the card already. It is treated as a | 832 | mostly initialized the card already. It is treated as a |
833 | completely dumb framebuffer device. | 833 | completely dumb framebuffer device. |
834 | 834 | ||
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index f2e243c353f9..4c9ec3f58c52 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
@@ -112,7 +112,7 @@ | |||
112 | +----------+---------------------------------------------+----------+-------+ | 112 | +----------+---------------------------------------------+----------+-------+ |
113 | | | ^ | | | | 113 | | | ^ | | | |
114 | | | |upper_margin | | | | 114 | | | |upper_margin | | | |
115 | | | ¥ | | | | 115 | | | v | | | |
116 | +----------###############################################----------+-------+ | 116 | +----------###############################################----------+-------+ |
117 | | # ^ # | | | 117 | | # ^ # | | |
118 | | # | # | | | 118 | | # | # | | |
@@ -133,15 +133,15 @@ | |||
133 | | # | # | | | 133 | | # | # | | |
134 | | # | # | | | 134 | | # | # | | |
135 | | # | # | | | 135 | | # | # | | |
136 | | # ¥ # | | | 136 | | # v # | | |
137 | +----------###############################################----------+-------+ | 137 | +----------###############################################----------+-------+ |
138 | | | ^ | | | | 138 | | | ^ | | | |
139 | | | |lower_margin | | | | 139 | | | |lower_margin | | | |
140 | | | ¥ | | | | 140 | | | v | | | |
141 | +----------+---------------------------------------------+----------+-------+ | 141 | +----------+---------------------------------------------+----------+-------+ |
142 | | | ^ | | | | 142 | | | ^ | | | |
143 | | | |vsync_len | | | | 143 | | | |vsync_len | | | |
144 | | | ¥ | | | | 144 | | | v | | | |
145 | +----------+---------------------------------------------+----------+-------+ | 145 | +----------+---------------------------------------------+----------+-------+ |
146 | 146 | ||
147 | 147 | ||
@@ -325,7 +325,7 @@ | |||
325 | CCIR -> PAL | 325 | CCIR -> PAL |
326 | ----------- | 326 | ----------- |
327 | 327 | ||
328 | - a scanline is 64 µs long, of which 52.48 µs are visible. This is about | 328 | - a scanline is 64 µs long, of which 52.48 µs are visible. This is about |
329 | 736 visible 70 ns pixels per line. | 329 | 736 visible 70 ns pixels per line. |
330 | - we have 625 scanlines, of which 575 are visible (interlaced); after | 330 | - we have 625 scanlines, of which 575 are visible (interlaced); after |
331 | rounding this becomes 576. | 331 | rounding this becomes 576. |
@@ -333,7 +333,7 @@ | |||
333 | RETMA -> NTSC | 333 | RETMA -> NTSC |
334 | ------------- | 334 | ------------- |
335 | 335 | ||
336 | - a scanline is 63.5 µs long, of which 53.5 µs are visible. This is about | 336 | - a scanline is 63.5 µs long, of which 53.5 µs are visible. This is about |
337 | 736 visible 70 ns pixels per line. | 337 | 736 visible 70 ns pixels per line. |
338 | - we have 525 scanlines, of which 485 are visible (interlaced); after | 338 | - we have 525 scanlines, of which 485 are visible (interlaced); after |
339 | rounding this becomes 484. | 339 | rounding this becomes 484. |
@@ -802,7 +802,7 @@ static u_short ecs_palette[32]; | |||
802 | 802 | ||
803 | static u_short do_vmode_full = 0; /* Change the Video Mode */ | 803 | static u_short do_vmode_full = 0; /* Change the Video Mode */ |
804 | static u_short do_vmode_pan = 0; /* Update the Video Mode */ | 804 | static u_short do_vmode_pan = 0; /* Update the Video Mode */ |
805 | static short do_blank = 0; /* (Un)Blank the Screen (±1) */ | 805 | static short do_blank = 0; /* (Un)Blank the Screen (±1) */ |
806 | static u_short do_cursor = 0; /* Move the Cursor */ | 806 | static u_short do_cursor = 0; /* Move the Cursor */ |
807 | 807 | ||
808 | 808 | ||
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index abe0c435a664..d775eb6590b6 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * Anthony Tong <atong@uiuc.edu> | 26 | * Anthony Tong <atong@uiuc.edu> |
27 | * | 27 | * |
28 | * Generic LCD support written by Daniel Mantione, ported from 2.4.20 by Alex Kern | 28 | * Generic LCD support written by Daniel Mantione, ported from 2.4.20 by Alex Kern |
29 | * Many Thanks to Ville Syrjälä for patches and fixing nasting 16 bit color bug. | 29 | * Many Thanks to Ville Syrjälä for patches and fixing nasting 16 bit color bug. |
30 | * | 30 | * |
31 | * This file is subject to the terms and conditions of the GNU General Public | 31 | * This file is subject to the terms and conditions of the GNU General Public |
32 | * License. See the file COPYING in the main directory of this archive for | 32 | * License. See the file COPYING in the main directory of this archive for |
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index a22ccf9485a4..267422f66255 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig | |||
@@ -27,7 +27,7 @@ config VGACON_SOFT_SCROLLBACK | |||
27 | The scrollback buffer of the standard VGA console is located in | 27 | The scrollback buffer of the standard VGA console is located in |
28 | the VGA RAM. The size of this RAM is fixed and is quite small. | 28 | the VGA RAM. The size of this RAM is fixed and is quite small. |
29 | If you require a larger scrollback buffer, this can be placed in | 29 | If you require a larger scrollback buffer, this can be placed in |
30 | System RAM which is dynamically allocated during intialization. | 30 | System RAM which is dynamically allocated during initialization. |
31 | Placing the scrollback buffer in System RAM will slightly slow | 31 | Placing the scrollback buffer in System RAM will slightly slow |
32 | down the console. | 32 | down the console. |
33 | 33 | ||
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index e8e38edb9b5b..481d58f7535d 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/ | 4 | * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/ |
5 | * 945G/945GM integrated graphics chips. | 5 | * 945G/945GM integrated graphics chips. |
6 | * | 6 | * |
7 | * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org> | 7 | * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org> |
8 | * 2004 Sylvain Meyer | 8 | * 2004 Sylvain Meyer |
9 | * 2006 David Airlie | 9 | * 2006 David Airlie |
10 | * | 10 | * |
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 2a0e32074f7d..5f6fb7d2c408 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Linux framebuffer driver for Intel(R) 865G integrated graphics chips. | 4 | * Linux framebuffer driver for Intel(R) 865G integrated graphics chips. |
5 | * | 5 | * |
6 | * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org> | 6 | * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org> |
7 | * 2004 Sylvain Meyer | 7 | * 2004 Sylvain Meyer |
8 | * | 8 | * |
9 | * This driver consists of two parts. The first part (intelfbdrv.c) provides | 9 | * This driver consists of two parts. The first part (intelfbdrv.c) provides |
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig index 7f4d25b8a184..f4fcf11b290d 100644 --- a/drivers/video/omap/Kconfig +++ b/drivers/video/omap/Kconfig | |||
@@ -8,7 +8,7 @@ config FB_OMAP | |||
8 | Frame buffer driver for OMAP based boards. | 8 | Frame buffer driver for OMAP based boards. |
9 | 9 | ||
10 | config FB_OMAP_BOOTLOADER_INIT | 10 | config FB_OMAP_BOOTLOADER_INIT |
11 | bool "Check bootloader initializaion" | 11 | bool "Check bootloader initialization" |
12 | depends on FB_OMAP | 12 | depends on FB_OMAP |
13 | help | 13 | help |
14 | Say Y here if you want to enable checking if the bootloader has | 14 | Say Y here if you want to enable checking if the bootloader has |
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index ae08d4587091..5857ccf5f6b1 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -56,7 +56,7 @@ | |||
56 | * - Add support for different devices | 56 | * - Add support for different devices |
57 | * - Backlight support | 57 | * - Backlight support |
58 | * | 58 | * |
59 | * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at> | 59 | * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at> |
60 | * - added clock (de-)allocation code | 60 | * - added clock (de-)allocation code |
61 | * - added fixem fbmem option | 61 | * - added fixem fbmem option |
62 | * | 62 | * |
@@ -64,7 +64,7 @@ | |||
64 | * - code cleanup | 64 | * - code cleanup |
65 | * - added a forgotten return in h1940fb_init | 65 | * - added a forgotten return in h1940fb_init |
66 | * | 66 | * |
67 | * 2004-07-19: Herbert Pötzl <herbert@13thfloor.at> | 67 | * 2004-07-19: Herbert Pötzl <herbert@13thfloor.at> |
68 | * - code cleanup and extended debugging | 68 | * - code cleanup and extended debugging |
69 | * | 69 | * |
70 | * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org> | 70 | * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org> |
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c index ff9e805c43bc..c31f549ebea0 100644 --- a/drivers/video/vermilion/vermilion.c +++ b/drivers/video/vermilion/vermilion.c | |||
@@ -23,8 +23,8 @@ | |||
23 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 23 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
24 | * | 24 | * |
25 | * Authors: | 25 | * Authors: |
26 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 26 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
27 | * Michel Dänzer <michel-at-tungstengraphics-dot-com> | 27 | * Michel Dänzer <michel-at-tungstengraphics-dot-com> |
28 | * Alan Hourihane <alanh-at-tungstengraphics-dot-com> | 28 | * Alan Hourihane <alanh-at-tungstengraphics-dot-com> |
29 | */ | 29 | */ |
30 | 30 | ||
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h index 1fc6695a49d2..c4aba59d4809 100644 --- a/drivers/video/vermilion/vermilion.h +++ b/drivers/video/vermilion/vermilion.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 23 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
24 | * | 24 | * |
25 | * Authors: | 25 | * Authors: |
26 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 26 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifndef _VERMILION_H_ | 29 | #ifndef _VERMILION_H_ |
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c index c5982502c03d..f236954d2536 100644 --- a/drivers/watchdog/i6300esb.c +++ b/drivers/watchdog/i6300esb.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * i6300esb: Watchdog timer driver for Intel 6300ESB chipset | 2 | * i6300esb: Watchdog timer driver for Intel 6300ESB chipset |
3 | * | 3 | * |
4 | * (c) Copyright 2004 Google Inc. | 4 | * (c) Copyright 2004 Google Inc. |
5 | * (c) Copyright 2005 David Härdeman <david@2gen.com> | 5 | * (c) Copyright 2005 David Härdeman <david@2gen.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 |
8 | * modify it under the terms of the GNU General Public License | 8 | * modify it under the terms of the GNU General Public License |
@@ -19,7 +19,7 @@ | |||
19 | * Initial version 0.01 | 19 | * Initial version 0.01 |
20 | * 2004YYZZ Ross Biro | 20 | * 2004YYZZ Ross Biro |
21 | * Version 0.02 | 21 | * Version 0.02 |
22 | * 20050210 David Härdeman <david@2gen.com> | 22 | * 20050210 David Härdeman <david@2gen.com> |
23 | * Ported driver to kernel 2.6 | 23 | * Ported driver to kernel 2.6 |
24 | */ | 24 | */ |
25 | 25 | ||
@@ -521,7 +521,7 @@ static void __exit watchdog_cleanup (void) | |||
521 | module_init(watchdog_init); | 521 | module_init(watchdog_init); |
522 | module_exit(watchdog_cleanup); | 522 | module_exit(watchdog_cleanup); |
523 | 523 | ||
524 | MODULE_AUTHOR("Ross Biro and David Härdeman"); | 524 | MODULE_AUTHOR("Ross Biro and David Härdeman"); |
525 | MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets"); | 525 | MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets"); |
526 | MODULE_LICENSE("GPL"); | 526 | MODULE_LICENSE("GPL"); |
527 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 527 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c index 415083990097..cafc465f2ae3 100644 --- a/drivers/watchdog/iTCO_vendor_support.c +++ b/drivers/watchdog/iTCO_vendor_support.c | |||
@@ -115,7 +115,7 @@ static void supermicro_old_pre_keepalive(unsigned long acpibase) | |||
115 | * For P4DPx: | 115 | * For P4DPx: |
116 | * BIOS setup -> Advanced -> I/O Device Configuration -> Watch Dog | 116 | * BIOS setup -> Advanced -> I/O Device Configuration -> Watch Dog |
117 | * This setting enables or disables Watchdog function. When enabled, the | 117 | * This setting enables or disables Watchdog function. When enabled, the |
118 | * default watchdog timer is set to be 5 minutes (about 4’35â€). It is | 118 | * default watchdog timer is set to be 5 minutes (about 4m35s). It is |
119 | * enough to load and run the OS. The application (service or driver) has | 119 | * enough to load and run the OS. The application (service or driver) has |
120 | * to take over the control once OS is running up and before watchdog | 120 | * to take over the control once OS is running up and before watchdog |
121 | * expires. | 121 | * expires. |
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c index d9e821d08deb..51826c216d6d 100644 --- a/drivers/watchdog/w83697hf_wdt.c +++ b/drivers/watchdog/w83697hf_wdt.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * which is based on wdt.c. | 8 | * which is based on wdt.c. |
9 | * Original copyright messages: | 9 | * Original copyright messages: |
10 | * | 10 | * |
11 | * (c) Copyright 2003 Pádraig Brady <P@draigBrady.com> | 11 | * (c) Copyright 2003 Pádraig Brady <P@draigBrady.com> |
12 | * | 12 | * |
13 | * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl> | 13 | * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl> |
14 | * | 14 | * |
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids index 5bd4b05d4c45..560fef2a7b1c 100644 --- a/drivers/zorro/zorro.ids +++ b/drivers/zorro/zorro.ids | |||
@@ -295,7 +295,7 @@ | |||
295 | 0100 RH 800C [HD Controller] | 295 | 0100 RH 800C [HD Controller] |
296 | 0200 RH 800C [RAM Expansion] | 296 | 0200 RH 800C [RAM Expansion] |
297 | 0861 Kato | 297 | 0861 Kato |
298 | # The Rainbow II and III are actually made by Ingenieurbüro Helfrich | 298 | # The Rainbow II and III are actually made by Ingenieurbüro Helfrich |
299 | 2000 Rainbow II [Graphics Card] | 299 | 2000 Rainbow II [Graphics Card] |
300 | 2100 Rainbow III [Graphics Card] | 300 | 2100 Rainbow III [Graphics Card] |
301 | 8000 Melody MPEG [Audio Card] | 301 | 8000 Melody MPEG [Audio Card] |