diff options
author | Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> | 2006-03-24 12:23:14 -0500 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-03-24 12:23:14 -0500 |
commit | c30fe7f73194650148b58ee80908c1bc38246397 (patch) | |
tree | 0433d79fb7c737f838aa2b787b5d9682bc60c66c /drivers | |
parent | c690a72253b962b7274559f2cdf4844553076c03 (diff) |
fix typos "wich" -> "which"
Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/Kconfig | 3 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_x25iface.c | 2 | ||||
-rw-r--r-- | drivers/serial/mpc52xx_uart.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/option.c | 2 | ||||
-rw-r--r-- | drivers/video/sstfb.c | 2 | ||||
-rw-r--r-- | drivers/w1/masters/matrox_w1.c | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 82710ae39228..5cb96300eb0f 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -256,7 +256,8 @@ config ACPI_CUSTOM_DSDT_FILE | |||
256 | depends on ACPI_CUSTOM_DSDT | 256 | depends on ACPI_CUSTOM_DSDT |
257 | default "" | 257 | default "" |
258 | help | 258 | help |
259 | Enter the full path name to the file wich includes the AmlCode declaration. | 259 | Enter the full path name to the file which includes the AmlCode |
260 | declaration. | ||
260 | 261 | ||
261 | config ACPI_BLACKLIST_YEAR | 262 | config ACPI_BLACKLIST_YEAR |
262 | int "Disable ACPI for systems before Jan 1st this year" if X86_32 | 263 | int "Disable ACPI for systems before Jan 1st this year" if X86_32 |
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c index edf14a2aa3c8..743ac4077f35 100644 --- a/drivers/isdn/i4l/isdn_x25iface.c +++ b/drivers/isdn/i4l/isdn_x25iface.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * stuff needed to support the Linux X.25 PLP code on top of devices that | 8 | * stuff needed to support the Linux X.25 PLP code on top of devices that |
9 | * can provide a lab_b service using the concap_proto mechanism. | 9 | * can provide a lab_b service using the concap_proto mechanism. |
10 | * This module supports a network interface wich provides lapb_sematics | 10 | * This module supports a network interface which provides lapb_sematics |
11 | * -- as defined in Documentation/networking/x25-iface.txt -- to | 11 | * -- as defined in Documentation/networking/x25-iface.txt -- to |
12 | * the upper layer and assumes that the lower layer provides a reliable | 12 | * the upper layer and assumes that the lower layer provides a reliable |
13 | * data link service by means of the concap_device_ops callbacks. | 13 | * data link service by means of the concap_device_ops callbacks. |
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 928e6cf12dca..6459edc7f5c5 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
@@ -40,7 +40,7 @@ | |||
40 | * and so on). So the PSC1 is mapped to /dev/ttyPSC0, PSC2 to /dev/ttyPSC1 and | 40 | * and so on). So the PSC1 is mapped to /dev/ttyPSC0, PSC2 to /dev/ttyPSC1 and |
41 | * so on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly | 41 | * so on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly |
42 | * fpr the console code : without this 1:1 mapping, at early boot time, when we | 42 | * fpr the console code : without this 1:1 mapping, at early boot time, when we |
43 | * are parsing the kernel args console=ttyPSC?, we wouldn't know wich PSC it | 43 | * are parsing the kernel args console=ttyPSC?, we wouldn't know which PSC it |
44 | * will be mapped to. | 44 | * will be mapped to. |
45 | */ | 45 | */ |
46 | 46 | ||
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index a8455c9e79dd..495db5755df9 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -102,7 +102,7 @@ static struct usb_driver option_driver = { | |||
102 | .no_dynamic_id = 1, | 102 | .no_dynamic_id = 1, |
103 | }; | 103 | }; |
104 | 104 | ||
105 | /* The card has three separate interfaces, wich the serial driver | 105 | /* The card has three separate interfaces, which the serial driver |
106 | * recognizes separately, thus num_port=1. | 106 | * recognizes separately, thus num_port=1. |
107 | */ | 107 | */ |
108 | static struct usb_serial_driver option_3port_device = { | 108 | static struct usb_serial_driver option_3port_device = { |
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index 99921df35474..8c1a8b5135c6 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | -TODO: at one time or another test that the mode is acceptable by the monitor | 33 | -TODO: at one time or another test that the mode is acceptable by the monitor |
34 | -ASK: Can I choose different ordering for the color bitfields (rgba argb ...) | 34 | -ASK: Can I choose different ordering for the color bitfields (rgba argb ...) |
35 | wich one should i use ? is there any preferred one ? It seems ARGB is | 35 | which one should i use ? is there any preferred one ? It seems ARGB is |
36 | the one ... | 36 | the one ... |
37 | -TODO: in set_var check the validity of timings (hsync vsync)... | 37 | -TODO: in set_var check the validity of timings (hsync vsync)... |
38 | -TODO: check and recheck the use of sst_wait_idle : we don't flush the fifo via | 38 | -TODO: check and recheck the use of sst_wait_idle : we don't flush the fifo via |
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c index 591809cbbb97..2788b8ca9bb1 100644 --- a/drivers/w1/masters/matrox_w1.c +++ b/drivers/w1/masters/matrox_w1.c | |||
@@ -98,7 +98,7 @@ static void matrox_w1_write_ddc_bit(void *, u8); | |||
98 | * | 98 | * |
99 | * Using tristate pins, since i can't find any open-drain pin in whole motherboard. | 99 | * Using tristate pins, since i can't find any open-drain pin in whole motherboard. |
100 | * Unfortunately we can't connect to Intel's 82801xx IO controller | 100 | * Unfortunately we can't connect to Intel's 82801xx IO controller |
101 | * since we don't know motherboard schema, wich has pretty unused(may be not) GPIO. | 101 | * since we don't know motherboard schema, which has pretty unused(may be not) GPIO. |
102 | * | 102 | * |
103 | * I've heard that PIIX also has open drain pin. | 103 | * I've heard that PIIX also has open drain pin. |
104 | * | 104 | * |