aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Espinasse <g.esp@free.fr>2010-03-29 09:41:47 -0400
committerJiri Kosina <jkosina@suse.cz>2010-03-29 09:41:47 -0400
commitf77f13e22df4a40d237697df496152c8c37f3f2b (patch)
treebeccbb0214078d68027f7a17b57be556292475bd
parent5239c4ff4ae9e810ba761518ad71b463f0ccbf3c (diff)
Fix comment and Kconfig typos for 'require' and 'fragment'
Signed-off-by: Gilles Espinasse <g.esp@free.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--Documentation/powerpc/dts-bindings/xilinx.txt2
-rw-r--r--arch/mips/sibyte/bcm1480/irq.c2
-rw-r--r--arch/mips/sibyte/sb1250/irq.c2
-rw-r--r--crypto/Kconfig2
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
-rw-r--r--drivers/gpu/drm/radeon/atombios.h4
-rw-r--r--drivers/isdn/hardware/mISDN/hfcmulti.c2
-rw-r--r--drivers/net/bnx2x_hsi.h2
-rw-r--r--drivers/net/ps3_gelic_wireless.c2
-rw-r--r--drivers/staging/vt6655/rxtx.c14
-rw-r--r--drivers/staging/vt6656/rxtx.c6
-rw-r--r--drivers/usb/wusbcore/wa-xfer.c2
-rw-r--r--net/ipv4/ipmr.c2
-rwxr-xr-xscripts/package/mkspec2
14 files changed, 24 insertions, 24 deletions
diff --git a/Documentation/powerpc/dts-bindings/xilinx.txt b/Documentation/powerpc/dts-bindings/xilinx.txt
index ea68046bb9cb..299d0923537b 100644
--- a/Documentation/powerpc/dts-bindings/xilinx.txt
+++ b/Documentation/powerpc/dts-bindings/xilinx.txt
@@ -11,7 +11,7 @@
11 control how the core is synthesized. Historically, the EDK tool would 11 control how the core is synthesized. Historically, the EDK tool would
12 extract the device parameters relevant to device drivers and copy them 12 extract the device parameters relevant to device drivers and copy them
13 into an 'xparameters.h' in the form of #define symbols. This tells the 13 into an 'xparameters.h' in the form of #define symbols. This tells the
14 device drivers how the IP cores are configured, but it requres the kernel 14 device drivers how the IP cores are configured, but it requires the kernel
15 to be recompiled every time the FPGA bitstream is resynthesized. 15 to be recompiled every time the FPGA bitstream is resynthesized.
16 16
17 The new approach is to export the parameters into the device tree and 17 The new approach is to export the parameters into the device tree and
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 06e25d949768..3fbb033e23d8 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -254,7 +254,7 @@ void __init init_bcm1480_irqs(void)
254 * On the second cpu, everything is set to IP5, which is 254 * On the second cpu, everything is set to IP5, which is
255 * ignored, EXCEPT the mailbox interrupt. That one is 255 * ignored, EXCEPT the mailbox interrupt. That one is
256 * set to IP[2] so it is handled. This is needed so we 256 * set to IP[2] so it is handled. This is needed so we
257 * can do cross-cpu function calls, as requred by SMP 257 * can do cross-cpu function calls, as required by SMP
258 */ 258 */
259 259
260#define IMR_IP2_VAL K_BCM1480_INT_MAP_I0 260#define IMR_IP2_VAL K_BCM1480_INT_MAP_I0
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index ab44a2f59ee4..b452e3c82792 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -237,7 +237,7 @@ void __init init_sb1250_irqs(void)
237 * On the second cpu, everything is set to IP5, which is 237 * On the second cpu, everything is set to IP5, which is
238 * ignored, EXCEPT the mailbox interrupt. That one is 238 * ignored, EXCEPT the mailbox interrupt. That one is
239 * set to IP[2] so it is handled. This is needed so we 239 * set to IP[2] so it is handled. This is needed so we
240 * can do cross-cpu function calls, as requred by SMP 240 * can do cross-cpu function calls, as required by SMP
241 */ 241 */
242 242
243#define IMR_IP2_VAL K_INT_MAP_I0 243#define IMR_IP2_VAL K_INT_MAP_I0
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 403857ad06d4..9d9434f08c92 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -28,7 +28,7 @@ config CRYPTO_FIPS
28 This options enables the fips boot option which is 28 This options enables the fips boot option which is
29 required if you want to system to operate in a FIPS 200 29 required if you want to system to operate in a FIPS 200
30 certification. You should say no unless you know what 30 certification. You should say no unless you know what
31 this is. Note that CRYPTO_ANSI_CPRNG is requred if this 31 this is. Note that CRYPTO_ANSI_CPRNG is required if this
32 option is selected 32 option is selected
33 33
34config CRYPTO_ALGAPI 34config CRYPTO_ALGAPI
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9cd6de5f9906..c297fc22867e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -904,9 +904,9 @@ intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
904 904
905 memset(best_clock, 0, sizeof(*best_clock)); 905 memset(best_clock, 0, sizeof(*best_clock));
906 max_n = limit->n.max; 906 max_n = limit->n.max;
907 /* based on hardware requriment prefer smaller n to precision */ 907 /* based on hardware requirement, prefer smaller n to precision */
908 for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) { 908 for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
909 /* based on hardware requirment prefere larger m1,m2 */ 909 /* based on hardware requirement, prefere larger m1,m2 */
910 for (clock.m1 = limit->m1.max; 910 for (clock.m1 = limit->m1.max;
911 clock.m1 >= limit->m1.min; clock.m1--) { 911 clock.m1 >= limit->m1.min; clock.m1--) {
912 for (clock.m2 = limit->m2.max; 912 for (clock.m2 = limit->m2.max;
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h
index 6732b5dd8ff4..e91a815861f4 100644
--- a/drivers/gpu/drm/radeon/atombios.h
+++ b/drivers/gpu/drm/radeon/atombios.h
@@ -3780,7 +3780,7 @@ typedef struct _ATOM_ASIC_SS_ASSIGNMENT
3780 UCHAR ucReserved[2]; 3780 UCHAR ucReserved[2];
3781}ATOM_ASIC_SS_ASSIGNMENT; 3781}ATOM_ASIC_SS_ASSIGNMENT;
3782 3782
3783//Define ucClockIndication, SW uses the IDs below to search if the SS is requried/enabled on a clock branch/signal type. 3783//Define ucClockIndication, SW uses the IDs below to search if the SS is required/enabled on a clock branch/signal type.
3784//SS is not required or enabled if a match is not found. 3784//SS is not required or enabled if a match is not found.
3785#define ASIC_INTERNAL_MEMORY_SS 1 3785#define ASIC_INTERNAL_MEMORY_SS 1
3786#define ASIC_INTERNAL_ENGINE_SS 2 3786#define ASIC_INTERNAL_ENGINE_SS 2
@@ -5895,7 +5895,7 @@ typedef struct _ATOM_PPLIB_RS780_CLOCK_INFO
5895 UCHAR ucPadding; // For proper alignment and size. 5895 UCHAR ucPadding; // For proper alignment and size.
5896 USHORT usVDDC; // For the 780, use: None, Low, High, Variable 5896 USHORT usVDDC; // For the 780, use: None, Low, High, Variable
5897 UCHAR ucMaxHTLinkWidth; // From SBIOS - {2, 4, 8, 16} 5897 UCHAR ucMaxHTLinkWidth; // From SBIOS - {2, 4, 8, 16}
5898 UCHAR ucMinHTLinkWidth; // From SBIOS - {2, 4, 8, 16}. Effective only if CDLW enabled. Minimum down stream width could be bigger as display BW requriement. 5898 UCHAR ucMinHTLinkWidth; // From SBIOS - {2, 4, 8, 16}. Effective only if CDLW enabled. Minimum down stream width could be bigger as display BW requirement.
5899 USHORT usHTLinkFreq; // See definition ATOM_PPLIB_RS780_HTLINKFREQ_xxx or in MHz(>=200). 5899 USHORT usHTLinkFreq; // See definition ATOM_PPLIB_RS780_HTLINKFREQ_xxx or in MHz(>=200).
5900 ULONG ulFlags; 5900 ULONG ulFlags;
5901} ATOM_PPLIB_RS780_CLOCK_INFO; 5901} ATOM_PPLIB_RS780_CLOCK_INFO;
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index ad36df9b759c..fa82ce32aa4e 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -117,7 +117,7 @@
117 * NOTE: only one mode value must be given for every card. 117 * NOTE: only one mode value must be given for every card.
118 * -> See hfc_multi.h for HFC_IO_MODE_* values 118 * -> See hfc_multi.h for HFC_IO_MODE_* values
119 * By default, the IO mode is pci memory IO (MEMIO). 119 * By default, the IO mode is pci memory IO (MEMIO).
120 * Some cards requre specific IO mode, so it cannot be changed. 120 * Some cards require specific IO mode, so it cannot be changed.
121 * It may be usefull to set IO mode to register io (REGIO) to solve 121 * It may be usefull to set IO mode to register io (REGIO) to solve
122 * PCI bridge problems. 122 * PCI bridge problems.
123 * If unsure, don't give this parameter. 123 * If unsure, don't give this parameter.
diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h
index 760069345b11..fd1f29e0317d 100644
--- a/drivers/net/bnx2x_hsi.h
+++ b/drivers/net/bnx2x_hsi.h
@@ -683,7 +683,7 @@ struct drv_func_mb {
683#define DRV_MSG_CODE_GET_MANUF_KEY 0x82000000 683#define DRV_MSG_CODE_GET_MANUF_KEY 0x82000000
684#define DRV_MSG_CODE_LOAD_L2B_PRAM 0x90000000 684#define DRV_MSG_CODE_LOAD_L2B_PRAM 0x90000000
685 /* 685 /*
686 * The optic module verification commands requris bootcode 686 * The optic module verification commands require bootcode
687 * v5.0.6 or later 687 * v5.0.6 or later
688 */ 688 */
689#define DRV_MSG_CODE_VRFY_OPT_MDL 0xa0000000 689#define DRV_MSG_CODE_VRFY_OPT_MDL 0xa0000000
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index 2663b2fdc0bb..7fe54c261c44 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -95,7 +95,7 @@ static inline int precise_ie(void)
95 * post_eurus_cmd helpers 95 * post_eurus_cmd helpers
96 */ 96 */
97struct eurus_cmd_arg_info { 97struct eurus_cmd_arg_info {
98 int pre_arg; /* command requres arg1, arg2 at POST COMMAND */ 98 int pre_arg; /* command requires arg1, arg2 at POST COMMAND */
99 int post_arg; /* command requires arg1, arg2 at GET_RESULT */ 99 int post_arg; /* command requires arg1, arg2 at GET_RESULT */
100}; 100};
101 101
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index ed3070edcac1..4fcc4351e73f 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -25,19 +25,19 @@
25 * Date: May 20, 2003 25 * Date: May 20, 2003
26 * 26 *
27 * Functions: 27 * Functions:
28 * s_vGenerateTxParameter - Generate tx dma requried parameter. 28 * s_vGenerateTxParameter - Generate tx dma required parameter.
29 * vGenerateMACHeader - Translate 802.3 to 802.11 header 29 * vGenerateMACHeader - Translate 802.3 to 802.11 header
30 * cbGetFragCount - Caculate fragement number count 30 * cbGetFragCount - Caculate fragment number count
31 * csBeacon_xmit - beacon tx function 31 * csBeacon_xmit - beacon tx function
32 * csMgmt_xmit - management tx function 32 * csMgmt_xmit - management tx function
33 * s_cbFillTxBufHead - fulfill tx dma buffer header 33 * s_cbFillTxBufHead - fulfill tx dma buffer header
34 * s_uGetDataDuration - get tx data required duration 34 * s_uGetDataDuration - get tx data required duration
35 * s_uFillDataHead- fulfill tx data duration header 35 * s_uFillDataHead- fulfill tx data duration header
36 * s_uGetRTSCTSDuration- get rtx/cts requried duration 36 * s_uGetRTSCTSDuration- get rtx/cts required duration
37 * s_uGetRTSCTSRsvTime- get rts/cts reserved time 37 * s_uGetRTSCTSRsvTime- get rts/cts reserved time
38 * s_uGetTxRsvTime- get frame reserved time 38 * s_uGetTxRsvTime- get frame reserved time
39 * s_vFillCTSHead- fulfill CTS ctl header 39 * s_vFillCTSHead- fulfill CTS ctl header
40 * s_vFillFragParameter- Set fragement ctl parameter. 40 * s_vFillFragParameter- Set fragment ctl parameter.
41 * s_vFillRTSHead- fulfill RTS ctl header 41 * s_vFillRTSHead- fulfill RTS ctl header
42 * s_vFillTxKey- fulfill tx encrypt key 42 * s_vFillTxKey- fulfill tx encrypt key
43 * s_vSWencryption- Software encrypt header 43 * s_vSWencryption- Software encrypt header
@@ -877,7 +877,7 @@ s_vFillRTSHead (
877 } 877 }
878 878
879 // Note: So far RTSHead dosen't appear in ATIM & Beacom DMA, so we don't need to take them into account. 879 // Note: So far RTSHead dosen't appear in ATIM & Beacom DMA, so we don't need to take them into account.
880 // Otherwise, we need to modified codes for them. 880 // Otherwise, we need to modify codes for them.
881 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { 881 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
882 if (byFBOption == AUTO_FB_NONE) { 882 if (byFBOption == AUTO_FB_NONE) {
883 PSRTS_g pBuf = (PSRTS_g)pvRTS; 883 PSRTS_g pBuf = (PSRTS_g)pvRTS;
@@ -1133,7 +1133,7 @@ s_vFillCTSHead (
1133 * 1133 *
1134 * Parameters: 1134 * Parameters:
1135 * In: 1135 * In:
1136 * pDevice - Pointer to adpater 1136 * pDevice - Pointer to adapter
1137 * pTxDataHead - Transmit Data Buffer 1137 * pTxDataHead - Transmit Data Buffer
1138 * pTxBufHead - pTxBufHead 1138 * pTxBufHead - pTxBufHead
1139 * pvRrvTime - pvRrvTime 1139 * pvRrvTime - pvRrvTime
@@ -2252,7 +2252,7 @@ vGenerateFIFOHeader (
2252 * 2252 *
2253 * Parameters: 2253 * Parameters:
2254 * In: 2254 * In:
2255 * pDevice - Pointer to adpater 2255 * pDevice - Pointer to adapter
2256 * dwTxBufferAddr - Transmit Buffer 2256 * dwTxBufferAddr - Transmit Buffer
2257 * pPacket - Packet from upper layer 2257 * pPacket - Packet from upper layer
2258 * cbPacketSize - Transmit Data Length 2258 * cbPacketSize - Transmit Data Length
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index d9fa36c95230..a2ce6fad8ee5 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -25,17 +25,17 @@
25 * Date: May 20, 2003 25 * Date: May 20, 2003
26 * 26 *
27 * Functions: 27 * Functions:
28 * s_vGenerateTxParameter - Generate tx dma requried parameter. 28 * s_vGenerateTxParameter - Generate tx dma required parameter.
29 * s_vGenerateMACHeader - Translate 802.3 to 802.11 header 29 * s_vGenerateMACHeader - Translate 802.3 to 802.11 header
30 * csBeacon_xmit - beacon tx function 30 * csBeacon_xmit - beacon tx function
31 * csMgmt_xmit - management tx function 31 * csMgmt_xmit - management tx function
32 * s_uGetDataDuration - get tx data required duration 32 * s_uGetDataDuration - get tx data required duration
33 * s_uFillDataHead- fulfill tx data duration header 33 * s_uFillDataHead- fulfill tx data duration header
34 * s_uGetRTSCTSDuration- get rtx/cts requried duration 34 * s_uGetRTSCTSDuration- get rtx/cts required duration
35 * s_uGetRTSCTSRsvTime- get rts/cts reserved time 35 * s_uGetRTSCTSRsvTime- get rts/cts reserved time
36 * s_uGetTxRsvTime- get frame reserved time 36 * s_uGetTxRsvTime- get frame reserved time
37 * s_vFillCTSHead- fulfill CTS ctl header 37 * s_vFillCTSHead- fulfill CTS ctl header
38 * s_vFillFragParameter- Set fragement ctl parameter. 38 * s_vFillFragParameter- Set fragment ctl parameter.
39 * s_vFillRTSHead- fulfill RTS ctl header 39 * s_vFillRTSHead- fulfill RTS ctl header
40 * s_vFillTxKey- fulfill tx encrypt key 40 * s_vFillTxKey- fulfill tx encrypt key
41 * s_vSWencryption- Software encrypt header 41 * s_vSWencryption- Software encrypt header
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 489b47833e2c..3aad333ae9ce 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -76,7 +76,7 @@
76 * xfers-per-ripe, blocks-per-rpipe, rpipes-per-host), at the end 76 * xfers-per-ripe, blocks-per-rpipe, rpipes-per-host), at the end
77 * we are going to have to rebuild all this based on an scheduler, 77 * we are going to have to rebuild all this based on an scheduler,
78 * to where we have a list of transactions to do and based on the 78 * to where we have a list of transactions to do and based on the
79 * availability of the different requried components (blocks, 79 * availability of the different required components (blocks,
80 * rpipes, segment slots, etc), we go scheduling them. Painful. 80 * rpipes, segment slots, etc), we go scheduling them. Painful.
81 */ 81 */
82#include <linux/init.h> 82#include <linux/init.h>
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 8582e12e4a62..b1373abe2489 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -22,7 +22,7 @@
22 * overflow. 22 * overflow.
23 * Carlos Picoto : PIMv1 Support 23 * Carlos Picoto : PIMv1 Support
24 * Pavlin Ivanov Radoslavov: PIMv2 Registers must checksum only PIM header 24 * Pavlin Ivanov Radoslavov: PIMv2 Registers must checksum only PIM header
25 * Relax this requrement to work with older peers. 25 * Relax this requirement to work with older peers.
26 * 26 *
27 */ 27 */
28 28
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 47bdd2f99b78..fa27f3dac769 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# Output a simple RPM spec file that uses no fancy features requring 3# Output a simple RPM spec file that uses no fancy features requiring
4# RPM v4. This is intended to work with any RPM distro. 4# RPM v4. This is intended to work with any RPM distro.
5# 5#
6# The only gothic bit here is redefining install_post to avoid 6# The only gothic bit here is redefining install_post to avoid