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/char/cyclades.c | |
| 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/char/cyclades.c')
| -rw-r--r-- | drivers/char/cyclades.c | 4 |
1 files changed, 1 insertions, 3 deletions
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[] = { |