aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/cachetlb.txt2
-rw-r--r--Documentation/ioctl/hdio.txt2
-rw-r--r--Documentation/laptop-mode.txt2
-rw-r--r--Documentation/networking/sk98lin.txt2
-rw-r--r--Documentation/x86_64/boot-options.txt2
-rw-r--r--drivers/s390/scsi/zfcp_erp.c2
-rw-r--r--drivers/scsi/gdth.c2
-rw-r--r--sound/oss/opl3sa2.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/cachetlb.txt b/Documentation/cachetlb.txt
index 7eb715e07eda..4ae418889b88 100644
--- a/Documentation/cachetlb.txt
+++ b/Documentation/cachetlb.txt
@@ -136,7 +136,7 @@ changes occur:
1368) void lazy_mmu_prot_update(pte_t pte) 1368) void lazy_mmu_prot_update(pte_t pte)
137 This interface is called whenever the protection on 137 This interface is called whenever the protection on
138 any user PTEs change. This interface provides a notification 138 any user PTEs change. This interface provides a notification
139 to architecture specific code to take appropiate action. 139 to architecture specific code to take appropriate action.
140 140
141 141
142Next, we have the cache flushing interfaces. In general, when Linux 142Next, we have the cache flushing interfaces. In general, when Linux
diff --git a/Documentation/ioctl/hdio.txt b/Documentation/ioctl/hdio.txt
index 9a7aea0636a5..11c9be49f37c 100644
--- a/Documentation/ioctl/hdio.txt
+++ b/Documentation/ioctl/hdio.txt
@@ -946,7 +946,7 @@ HDIO_SCAN_HWIF register and (re)scan interface
946 946
947 This ioctl initializes the addresses and irq for a disk 947 This ioctl initializes the addresses and irq for a disk
948 controller, probes for drives, and creates /proc/ide 948 controller, probes for drives, and creates /proc/ide
949 interfaces as appropiate. 949 interfaces as appropriate.
950 950
951 951
952 952
diff --git a/Documentation/laptop-mode.txt b/Documentation/laptop-mode.txt
index f42e4c089356..b18e21675906 100644
--- a/Documentation/laptop-mode.txt
+++ b/Documentation/laptop-mode.txt
@@ -357,7 +357,7 @@ MAX_AGE=${MAX_AGE:-'600'}
357# Read-ahead, in kilobytes 357# Read-ahead, in kilobytes
358READAHEAD=${READAHEAD:-'4096'} 358READAHEAD=${READAHEAD:-'4096'}
359 359
360# Shall we remount journaled fs. with appropiate commit interval? (1=yes) 360# Shall we remount journaled fs. with appropriate commit interval? (1=yes)
361DO_REMOUNTS=${DO_REMOUNTS:-'1'} 361DO_REMOUNTS=${DO_REMOUNTS:-'1'}
362 362
363# And shall we add the "noatime" option to that as well? (1=yes) 363# And shall we add the "noatime" option to that as well? (1=yes)
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt
index f9d979ee9526..7837c53fd5fe 100644
--- a/Documentation/networking/sk98lin.txt
+++ b/Documentation/networking/sk98lin.txt
@@ -91,7 +91,7 @@ To use the driver as a module, proceed as follows:
91 with (M) 91 with (M)
925. Execute the command "make modules". 925. Execute the command "make modules".
936. Execute the command "make modules_install". 936. Execute the command "make modules_install".
94 The appropiate modules will be installed. 94 The appropriate modules will be installed.
957. Reboot your system. 957. Reboot your system.
96 96
97 97
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 72ab9b99b22c..9c5fc15d03d1 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -198,6 +198,6 @@ Debugging
198 198
199Misc 199Misc
200 200
201 noreplacement Don't replace instructions with more appropiate ones 201 noreplacement Don't replace instructions with more appropriate ones
202 for the CPU. This may be useful on asymmetric MP systems 202 for the CPU. This may be useful on asymmetric MP systems
203 where some CPU have less capabilities than the others. 203 where some CPU have less capabilities than the others.
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 7bdb00b5aeb2..c065cb836c97 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -3403,7 +3403,7 @@ zfcp_erp_action_dequeue(struct zfcp_erp_action *erp_action)
3403/** 3403/**
3404 * zfcp_erp_action_cleanup 3404 * zfcp_erp_action_cleanup
3405 * 3405 *
3406 * Register unit with scsi stack if appropiate and fix reference counts. 3406 * Register unit with scsi stack if appropriate and fix reference counts.
3407 * Note: Temporary units are not registered with scsi stack. 3407 * Note: Temporary units are not registered with scsi stack.
3408 */ 3408 */
3409static void 3409static void
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index a6deb016584c..bd3ffdf6c800 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -328,7 +328,7 @@
328 * hdr_channel:x x - number of virtual bus for host drives 328 * hdr_channel:x x - number of virtual bus for host drives
329 * shared_access:Y disable driver reserve/release protocol to 329 * shared_access:Y disable driver reserve/release protocol to
330 * access a shared resource from several nodes, 330 * access a shared resource from several nodes,
331 * appropiate controller firmware required 331 * appropriate controller firmware required
332 * shared_access:N enable driver reserve/release protocol 332 * shared_access:N enable driver reserve/release protocol
333 * probe_eisa_isa:Y scan for EISA/ISA controllers 333 * probe_eisa_isa:Y scan for EISA/ISA controllers
334 * probe_eisa_isa:N do not scan for EISA/ISA controllers 334 * probe_eisa_isa:N do not scan for EISA/ISA controllers
diff --git a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c
index 5cecdbcbea9d..0e161c6a0477 100644
--- a/sound/oss/opl3sa2.c
+++ b/sound/oss/opl3sa2.c
@@ -530,7 +530,7 @@ static void __init attach_opl3sa2_mss(struct address_info* hw_config, struct res
530 if (hw_config->slots[0] != -1) { 530 if (hw_config->slots[0] != -1) {
531 /* Did the MSS driver install? */ 531 /* Did the MSS driver install? */
532 if(num_mixers == (initial_mixers + 1)) { 532 if(num_mixers == (initial_mixers + 1)) {
533 /* The MSS mixer is installed, reroute mixers appropiately */ 533 /* The MSS mixer is installed, reroute mixers appropriately */
534 AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_CD); 534 AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_CD);
535 AD1848_REROUTE(SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH); 535 AD1848_REROUTE(SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH);
536 AD1848_REROUTE(SOUND_MIXER_LINE3, SOUND_MIXER_LINE); 536 AD1848_REROUTE(SOUND_MIXER_LINE3, SOUND_MIXER_LINE);