aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/parisc/kernel/signal.c2
-rw-r--r--arch/sparc/kernel/ioport.c4
-rw-r--r--drivers/ide/ide-timing.h2
-rw-r--r--drivers/isdn/hardware/eicon/message.c2
-rw-r--r--drivers/isdn/hysdn/hycapi.c2
-rw-r--r--drivers/macintosh/smu.c2
-rw-r--r--drivers/media/video/pwc/pwc-if.c2
-rw-r--r--drivers/message/fusion/lsi/mpi_log_sas.h2
-rw-r--r--drivers/mtd/nftlmount.c2
-rw-r--r--drivers/net/irda/ali-ircc.h4
-rw-r--r--drivers/net/irda/nsc-ircc.h4
-rw-r--r--drivers/net/irda/via-ircc.h4
-rw-r--r--drivers/net/skfp/ess.c2
-rw-r--r--drivers/net/skfp/fplustm.c2
-rw-r--r--drivers/net/skfp/hwmtm.c2
-rw-r--r--drivers/net/wan/cycx_drv.c4
-rw-r--r--drivers/net/wireless/libertas/scan.c2
-rw-r--r--drivers/parport/probe.c2
-rw-r--r--drivers/spi/spi_imx.c2
-rw-r--r--fs/befs/datastream.c2
-rw-r--r--fs/jfs/jfs_xtree.c2
-rw-r--r--include/linux/cycx_x25.h2
-rw-r--r--include/linux/hdreg.h2
-rw-r--r--include/linux/reiserfs_fs_sb.h2
-rw-r--r--include/linux/wireless.h2
25 files changed, 30 insertions, 30 deletions
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 2ce3806f02e..58fccc96d00 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -333,7 +333,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
333 flush_user_icache_range((unsigned long) &frame->tramp[0], 333 flush_user_icache_range((unsigned long) &frame->tramp[0],
334 (unsigned long) &frame->tramp[TRAMP_SIZE]); 334 (unsigned long) &frame->tramp[TRAMP_SIZE]);
335 335
336 /* TRAMP Words 0-4, Lenght 5 = SIGRESTARTBLOCK_TRAMP 336 /* TRAMP Words 0-4, Length 5 = SIGRESTARTBLOCK_TRAMP
337 * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP 337 * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP
338 * So the SIGRETURN_TRAMP is at the end of SIGRESTARTBLOCK_TRAMP 338 * So the SIGRETURN_TRAMP is at the end of SIGRESTARTBLOCK_TRAMP
339 */ 339 */
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 97aa50d1e4a..ad0ede24ca1 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -305,7 +305,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
305 struct resource *res; 305 struct resource *res;
306 int order; 306 int order;
307 307
308 /* XXX why are some lenghts signed, others unsigned? */ 308 /* XXX why are some lengths signed, others unsigned? */
309 if (len <= 0) { 309 if (len <= 0) {
310 return NULL; 310 return NULL;
311 } 311 }
@@ -393,7 +393,7 @@ void sbus_free_consistent(struct sbus_dev *sdev, long n, void *p, u32 ba)
393 */ 393 */
394dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *va, size_t len, int direction) 394dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *va, size_t len, int direction)
395{ 395{
396 /* XXX why are some lenghts signed, others unsigned? */ 396 /* XXX why are some lengths signed, others unsigned? */
397 if (len <= 0) { 397 if (len <= 0) {
398 return 0; 398 return 0;
399 } 399 }
diff --git a/drivers/ide/ide-timing.h b/drivers/ide/ide-timing.h
index adeda762652..3b12ffe7707 100644
--- a/drivers/ide/ide-timing.h
+++ b/drivers/ide/ide-timing.h
@@ -199,7 +199,7 @@ static int ide_timing_compute(ide_drive_t *drive, short speed, struct ide_timing
199 } 199 }
200 200
201/* 201/*
202 * Lenghten active & recovery time so that cycle time is correct. 202 * Lengthen active & recovery time so that cycle time is correct.
203 */ 203 */
204 204
205 if (t->act8b + t->rec8b < t->cyc8b) { 205 if (t->act8b + t->rec8b < t->cyc8b) {
diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
index ccd35d047ec..b9177ca4369 100644
--- a/drivers/isdn/hardware/eicon/message.c
+++ b/drivers/isdn/hardware/eicon/message.c
@@ -4941,7 +4941,7 @@ void sig_ind(PLCI * plci)
4941 /* b = IE1 */ 4941 /* b = IE1 */
4942 /* S = IE1 length + cont. */ 4942 /* S = IE1 length + cont. */
4943 /* b = IE2 */ 4943 /* b = IE2 */
4944 /* S = IE2 lenght + cont. */ 4944 /* S = IE2 length + cont. */
4945 sendf(plci->appl, 4945 sendf(plci->appl,
4946 _MANUFACTURER_I, 4946 _MANUFACTURER_I,
4947 Id, 4947 Id,
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
index f85450146bd..d3999a8e9f8 100644
--- a/drivers/isdn/hysdn/hycapi.c
+++ b/drivers/isdn/hysdn/hycapi.c
@@ -541,7 +541,7 @@ hycapi_rx_capipkt(hysdn_card * card, unsigned char *buf, unsigned short len)
541 } 541 }
542 ctrl = &cinfo->capi_ctrl; 542 ctrl = &cinfo->capi_ctrl;
543 if(len < CAPI_MSG_BASELEN) { 543 if(len < CAPI_MSG_BASELEN) {
544 printk(KERN_ERR "HYSDN Card%d: invalid CAPI-message, lenght %d!\n", 544 printk(KERN_ERR "HYSDN Card%d: invalid CAPI-message, length %d!\n",
545 card->myid, len); 545 card->myid, len);
546 return; 546 return;
547 } 547 }
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index d409f675948..78559066478 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -179,7 +179,7 @@ static irqreturn_t smu_db_intr(int irq, void *arg)
179 /* CPU might have brought back the cache line, so we need 179 /* CPU might have brought back the cache line, so we need
180 * to flush again before peeking at the SMU response. We 180 * to flush again before peeking at the SMU response. We
181 * flush the entire buffer for now as we haven't read the 181 * flush the entire buffer for now as we haven't read the
182 * reply lenght (it's only 2 cache lines anyway) 182 * reply length (it's only 2 cache lines anyway)
183 */ 183 */
184 faddr = (unsigned long)smu->cmd_buf; 184 faddr = (unsigned long)smu->cmd_buf;
185 flush_inval_dcache_range(faddr, faddr + 256); 185 flush_inval_dcache_range(faddr, faddr + 256);
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 7300ace8f44..f991d72fe10 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -542,7 +542,7 @@ int pwc_handle_frame(struct pwc_device *pdev)
542 } 542 }
543 543
544 if (pdev->read_frame != NULL) { 544 if (pdev->read_frame != NULL) {
545 /* Decompression is a lenghty process, so it's outside of the lock. 545 /* Decompression is a lengthy process, so it's outside of the lock.
546 This gives the isoc_handler the opportunity to fill more frames 546 This gives the isoc_handler the opportunity to fill more frames
547 in the mean time. 547 in the mean time.
548 */ 548 */
diff --git a/drivers/message/fusion/lsi/mpi_log_sas.h b/drivers/message/fusion/lsi/mpi_log_sas.h
index 6be1f6b6577..af9da03e95e 100644
--- a/drivers/message/fusion/lsi/mpi_log_sas.h
+++ b/drivers/message/fusion/lsi/mpi_log_sas.h
@@ -162,7 +162,7 @@
162#define PL_LOGINFO_SUB_CODE_FRAME_XFER_ERROR (0x00000400) /* Bits 0-3 encode Transport Status Register (offset 0x08) */ 162#define PL_LOGINFO_SUB_CODE_FRAME_XFER_ERROR (0x00000400) /* Bits 0-3 encode Transport Status Register (offset 0x08) */
163 /* Bit 0 is Status Bit 0: FrameXferErr */ 163 /* Bit 0 is Status Bit 0: FrameXferErr */
164 /* Bit 1 & 2 are Status Bits 16 and 17: FrameXmitErrStatus */ 164 /* Bit 1 & 2 are Status Bits 16 and 17: FrameXmitErrStatus */
165 /* Bit 3 is Status Bit 18 WriteDataLenghtGTDataLengthErr */ 165 /* Bit 3 is Status Bit 18 WriteDataLengthGTDataLengthErr */
166 166
167#define PL_LOGINFO_SUB_CODE_TX_FM_CONNECTED_LOW (0x00000500) 167#define PL_LOGINFO_SUB_CODE_TX_FM_CONNECTED_LOW (0x00000500)
168#define PL_LOGINFO_SUB_CODE_SATA_NON_NCQ_RW_ERR_BIT_SET (0x00000600) 168#define PL_LOGINFO_SUB_CODE_SATA_NON_NCQ_RW_ERR_BIT_SET (0x00000600)
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index 067262ee8df..0513cbc8834 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -429,7 +429,7 @@ static void check_sectors_in_chain(struct NFTLrecord *nftl, unsigned int first_b
429 } 429 }
430} 430}
431 431
432/* calc_chain_lenght: Walk through a Virtual Unit Chain and estimate chain length */ 432/* calc_chain_length: Walk through a Virtual Unit Chain and estimate chain length */
433static int calc_chain_length(struct NFTLrecord *nftl, unsigned int first_block) 433static int calc_chain_length(struct NFTLrecord *nftl, unsigned int first_block)
434{ 434{
435 unsigned int length = 0, block = first_block; 435 unsigned int length = 0, block = first_block;
diff --git a/drivers/net/irda/ali-ircc.h b/drivers/net/irda/ali-ircc.h
index e489c6661ee..07876578887 100644
--- a/drivers/net/irda/ali-ircc.h
+++ b/drivers/net/irda/ali-ircc.h
@@ -173,13 +173,13 @@ struct st_fifo {
173 173
174struct frame_cb { 174struct frame_cb {
175 void *start; /* Start of frame in DMA mem */ 175 void *start; /* Start of frame in DMA mem */
176 int len; /* Lenght of frame in DMA mem */ 176 int len; /* Length of frame in DMA mem */
177}; 177};
178 178
179struct tx_fifo { 179struct tx_fifo {
180 struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */ 180 struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */
181 int ptr; /* Currently being sent */ 181 int ptr; /* Currently being sent */
182 int len; /* Lenght of queue */ 182 int len; /* Length of queue */
183 int free; /* Next free slot */ 183 int free; /* Next free slot */
184 void *tail; /* Next free start in DMA mem */ 184 void *tail; /* Next free start in DMA mem */
185}; 185};
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h
index bbdc97ff83c..29398a4f73f 100644
--- a/drivers/net/irda/nsc-ircc.h
+++ b/drivers/net/irda/nsc-ircc.h
@@ -231,13 +231,13 @@ struct st_fifo {
231 231
232struct frame_cb { 232struct frame_cb {
233 void *start; /* Start of frame in DMA mem */ 233 void *start; /* Start of frame in DMA mem */
234 int len; /* Lenght of frame in DMA mem */ 234 int len; /* Length of frame in DMA mem */
235}; 235};
236 236
237struct tx_fifo { 237struct tx_fifo {
238 struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */ 238 struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */
239 int ptr; /* Currently being sent */ 239 int ptr; /* Currently being sent */
240 int len; /* Lenght of queue */ 240 int len; /* Length of queue */
241 int free; /* Next free slot */ 241 int free; /* Next free slot */
242 void *tail; /* Next free start in DMA mem */ 242 void *tail; /* Next free start in DMA mem */
243}; 243};
diff --git a/drivers/net/irda/via-ircc.h b/drivers/net/irda/via-ircc.h
index 204b1b34ffc..9d012f0dbd3 100644
--- a/drivers/net/irda/via-ircc.h
+++ b/drivers/net/irda/via-ircc.h
@@ -54,13 +54,13 @@ struct st_fifo {
54 54
55struct frame_cb { 55struct frame_cb {
56 void *start; /* Start of frame in DMA mem */ 56 void *start; /* Start of frame in DMA mem */
57 int len; /* Lenght of frame in DMA mem */ 57 int len; /* Length of frame in DMA mem */
58}; 58};
59 59
60struct tx_fifo { 60struct tx_fifo {
61 struct frame_cb queue[MAX_TX_WINDOW + 2]; /* Info about frames in queue */ 61 struct frame_cb queue[MAX_TX_WINDOW + 2]; /* Info about frames in queue */
62 int ptr; /* Currently being sent */ 62 int ptr; /* Currently being sent */
63 int len; /* Lenght of queue */ 63 int len; /* Length of queue */
64 int free; /* Next free slot */ 64 int free; /* Next free slot */
65 void *tail; /* Next free start in DMA mem */ 65 void *tail; /* Next free start in DMA mem */
66}; 66};
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c
index 62b01328c49..889f9872461 100644
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/skfp/ess.c
@@ -598,7 +598,7 @@ static void ess_send_alc_req(struct s_smc *smc)
598 req->cmd.sba_cmd = REQUEST_ALLOCATION ; 598 req->cmd.sba_cmd = REQUEST_ALLOCATION ;
599 599
600 /* 600 /*
601 * set the parameter type and parameter lenght of all used 601 * set the parameter type and parameter length of all used
602 * parameters 602 * parameters
603 */ 603 */
604 604
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index a45205da803..76dc8adc944 100644
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -398,7 +398,7 @@ static void copy_tx_mac(struct s_smc *smc, u_long td, struct fddi_mac *mac,
398/* u_long td; transmit descriptor */ 398/* u_long td; transmit descriptor */
399/* struct fddi_mac *mac; mac frame pointer */ 399/* struct fddi_mac *mac; mac frame pointer */
400/* unsigned off; start address within buffer memory */ 400/* unsigned off; start address within buffer memory */
401/* int len ; lenght of the frame including the FC */ 401/* int len ; length of the frame including the FC */
402{ 402{
403 int i ; 403 int i ;
404 u_int *p ; 404 u_int *p ;
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c
index 8a430a36654..46e33931565 100644
--- a/drivers/net/skfp/hwmtm.c
+++ b/drivers/net/skfp/hwmtm.c
@@ -1185,7 +1185,7 @@ void process_receive(struct s_smc *smc)
1185 1185
1186 DB_RX("frame length = %d",len,0,4) ; 1186 DB_RX("frame length = %d",len,0,4) ;
1187 /* 1187 /*
1188 * check the frame_lenght and all error flags 1188 * check the frame_length and all error flags
1189 */ 1189 */
1190 if (rfsw & (RX_MSRABT|RX_FS_E|RX_FS_CRC|RX_FS_IMPL)){ 1190 if (rfsw & (RX_MSRABT|RX_FS_E|RX_FS_CRC|RX_FS_IMPL)){
1191 if (rfsw & RD_S_MSRABT) { 1191 if (rfsw & RD_S_MSRABT) {
diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c
index d347d59db65..d14e6678dee 100644
--- a/drivers/net/wan/cycx_drv.c
+++ b/drivers/net/wan/cycx_drv.c
@@ -322,7 +322,7 @@ static int cycx_data_boot(void __iomem *addr, u8 *code, u32 len)
322 void __iomem *pt_boot_cmd = addr + CMD_OFFSET; 322 void __iomem *pt_boot_cmd = addr + CMD_OFFSET;
323 u32 i; 323 u32 i;
324 324
325 /* boot buffer lenght */ 325 /* boot buffer length */
326 writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16)); 326 writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16));
327 writew(GEN_DEFPAR, pt_boot_cmd); 327 writew(GEN_DEFPAR, pt_boot_cmd);
328 328
@@ -353,7 +353,7 @@ static int cycx_code_boot(void __iomem *addr, u8 *code, u32 len)
353 void __iomem *pt_boot_cmd = addr + CMD_OFFSET; 353 void __iomem *pt_boot_cmd = addr + CMD_OFFSET;
354 u32 i; 354 u32 i;
355 355
356 /* boot buffer lenght */ 356 /* boot buffer length */
357 writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16)); 357 writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16));
358 writew(GEN_DEFPAR, pt_boot_cmd); 358 writew(GEN_DEFPAR, pt_boot_cmd);
359 359
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 9a61188b62e..69f94c92b32 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -1473,7 +1473,7 @@ int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
1473 * Called via lbs_prepare_and_send_command(priv, CMD_802_11_SCAN, ...) 1473 * Called via lbs_prepare_and_send_command(priv, CMD_802_11_SCAN, ...)
1474 * from cmd.c 1474 * from cmd.c
1475 * 1475 *
1476 * Sends a fixed lenght data part (specifying the BSS type and BSSID filters) 1476 * Sends a fixed length data part (specifying the BSS type and BSSID filters)
1477 * as well as a variable number/length of TLVs to the firmware. 1477 * as well as a variable number/length of TLVs to the firmware.
1478 * 1478 *
1479 * @param priv A pointer to struct lbs_private structure 1479 * @param priv A pointer to struct lbs_private structure
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index 853a15f44f8..cd565bb4e1a 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -163,7 +163,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,
163 idlens[1] = idlens[0]+2; 163 idlens[1] = idlens[0]+2;
164 if (belen != lelen) { 164 if (belen != lelen) {
165 int off = 2; 165 int off = 2;
166 /* Don't try lenghts of 0x100 and 0x200 as 1 and 2 */ 166 /* Don't try lengths of 0x100 and 0x200 as 1 and 2 */
167 if (idlens[0] <= 2) 167 if (idlens[0] <= 2)
168 off = 0; 168 off = 0;
169 idlens[off] = max(belen, lelen); 169 idlens[off] = max(belen, lelen);
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 2cd8573fb09..639963eb1ac 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -157,7 +157,7 @@
157#define SPI_FIFO_BYTE_WIDTH (2) 157#define SPI_FIFO_BYTE_WIDTH (2)
158#define SPI_FIFO_OVERFLOW_MARGIN (2) 158#define SPI_FIFO_OVERFLOW_MARGIN (2)
159 159
160/* DMA burst lenght for half full/empty request trigger */ 160/* DMA burst length for half full/empty request trigger */
161#define SPI_DMA_BLR (SPI_FIFO_DEPTH * SPI_FIFO_BYTE_WIDTH / 2) 161#define SPI_DMA_BLR (SPI_FIFO_DEPTH * SPI_FIFO_BYTE_WIDTH / 2)
162 162
163/* Dummy char output to achieve reads. 163/* Dummy char output to achieve reads.
diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c
index aacb4da6298..e3287d0d1a5 100644
--- a/fs/befs/datastream.c
+++ b/fs/befs/datastream.c
@@ -236,7 +236,7 @@ befs_count_blocks(struct super_block * sb, befs_data_stream * ds)
236 as in the indirect region code). 236 as in the indirect region code).
237 237
238 When/if blockno is found, if blockno is inside of a block 238 When/if blockno is found, if blockno is inside of a block
239 run as stored on disk, we offset the start and lenght members 239 run as stored on disk, we offset the start and length members
240 of the block run, so that blockno is the start and len is 240 of the block run, so that blockno is the start and len is
241 still valid (the run ends in the same place). 241 still valid (the run ends in the same place).
242 242
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 1543906a2e0..a000aaa7513 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -3965,7 +3965,7 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
3965 * xtTruncate_pmap() 3965 * xtTruncate_pmap()
3966 * 3966 *
3967 * function: 3967 * function:
3968 * Perform truncate to zero lenghth for deleted file, leaving the 3968 * Perform truncate to zero length for deleted file, leaving the
3969 * the xtree and working map untouched. This allows the file to 3969 * the xtree and working map untouched. This allows the file to
3970 * be accessed via open file handles, while the delete of the file 3970 * be accessed via open file handles, while the delete of the file
3971 * is committed to disk. 3971 * is committed to disk.
diff --git a/include/linux/cycx_x25.h b/include/linux/cycx_x25.h
index f7a90658346..362bf19d6cf 100644
--- a/include/linux/cycx_x25.h
+++ b/include/linux/cycx_x25.h
@@ -81,7 +81,7 @@ struct cycx_x25_cmd {
81 * @n2win - level 2 window (values: 1 thru 7) 81 * @n2win - level 2 window (values: 1 thru 7)
82 * @n3win - level 3 window (values: 1 thru 7) 82 * @n3win - level 3 window (values: 1 thru 7)
83 * @nvc - # of logical channels (values: 1 thru 64) 83 * @nvc - # of logical channels (values: 1 thru 64)
84 * @pktlen - level 3 packet lenght - log base 2 of size 84 * @pktlen - level 3 packet length - log base 2 of size
85 * @locaddr - my address 85 * @locaddr - my address
86 * @remaddr - remote address 86 * @remaddr - remote address
87 * @t1 - time, in seconds 87 * @t1 - time, in seconds
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h
index 3882013d29e..e38e75967e7 100644
--- a/include/linux/hdreg.h
+++ b/include/linux/hdreg.h
@@ -364,7 +364,7 @@ typedef struct hd_drive_hob_hdr {
364#define SETFEATURES_EN_RLA 0xAA /* Enable read look-ahead feature */ 364#define SETFEATURES_EN_RLA 0xAA /* Enable read look-ahead feature */
365#define SETFEATURES_PREFETCH 0xAB /* Sets drive prefetch value */ 365#define SETFEATURES_PREFETCH 0xAB /* Sets drive prefetch value */
366#define SETFEATURES_EN_REST 0xAC /* ATA-1 */ 366#define SETFEATURES_EN_REST 0xAC /* ATA-1 */
367#define SETFEATURES_4B_RW_LONG 0xBB /* Set Lenght of 4 bytes */ 367#define SETFEATURES_4B_RW_LONG 0xBB /* Set Length of 4 bytes */
368#define SETFEATURES_DIS_AAM 0xC2 /* Disable Automatic Acoustic Management */ 368#define SETFEATURES_DIS_AAM 0xC2 /* Disable Automatic Acoustic Management */
369#define SETFEATURES_EN_RPOD 0xCC /* Enable reverting to power on defaults */ 369#define SETFEATURES_EN_RPOD 0xCC /* Enable reverting to power on defaults */
370#define SETFEATURES_DIS_RI 0xDD /* Disable release interrupt ATAPI */ 370#define SETFEATURES_DIS_RI 0xDD /* Disable release interrupt ATAPI */
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index 10fa0c83201..db5ef9b83c3 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -185,7 +185,7 @@ struct reiserfs_journal {
185 unsigned long j_trans_id; 185 unsigned long j_trans_id;
186 unsigned long j_mount_id; 186 unsigned long j_mount_id;
187 unsigned long j_start; /* start of current waiting commit (index into j_ap_blocks) */ 187 unsigned long j_start; /* start of current waiting commit (index into j_ap_blocks) */
188 unsigned long j_len; /* lenght of current waiting commit */ 188 unsigned long j_len; /* length of current waiting commit */
189 unsigned long j_len_alloc; /* number of buffers requested by journal_begin() */ 189 unsigned long j_len_alloc; /* number of buffers requested by journal_begin() */
190 atomic_t j_wcount; /* count of writers for current commit */ 190 atomic_t j_wcount; /* count of writers for current commit */
191 unsigned long j_bcount; /* batch count. allows turning X transactions into 1 */ 191 unsigned long j_bcount; /* batch count. allows turning X transactions into 1 */
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index 74e84caa1e2..3160dfed73c 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -1079,7 +1079,7 @@ struct iw_priv_args
1079 */ 1079 */
1080struct iw_event 1080struct iw_event
1081{ 1081{
1082 __u16 len; /* Real lenght of this stuff */ 1082 __u16 len; /* Real length of this stuff */
1083 __u16 cmd; /* Wireless IOCTL */ 1083 __u16 cmd; /* Wireless IOCTL */
1084 union iwreq_data u; /* IOCTL fixed payload */ 1084 union iwreq_data u; /* IOCTL fixed payload */
1085}; 1085};