diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/mxser.h | 2 | ||||
-rw-r--r-- | drivers/char/synclink.c | 2 | ||||
-rw-r--r-- | drivers/edac/edac_mc.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/nsc-ircc.c | 2 | ||||
-rw-r--r-- | drivers/net/sis900.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/de4x5.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/pnic2.c | 2 | ||||
-rw-r--r-- | drivers/net/typhoon.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 2 | ||||
-rw-r--r-- | drivers/scsi/3w-9xxx.c | 2 | ||||
-rw-r--r-- | drivers/serial/8250.c | 2 | ||||
-rw-r--r-- | drivers/serial/serial_txx9.c | 2 | ||||
-rw-r--r-- | drivers/serial/sunsu.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-s3c2410.c | 2 | ||||
-rw-r--r-- | drivers/usb/net/zaurus.c | 2 |
16 files changed, 17 insertions, 17 deletions
diff --git a/drivers/char/mxser.h b/drivers/char/mxser.h index e7fd0b08e0b7..7e188a4d602a 100644 --- a/drivers/char/mxser.h +++ b/drivers/char/mxser.h | |||
@@ -118,7 +118,7 @@ | |||
118 | 118 | ||
119 | // enable CTS interrupt | 119 | // enable CTS interrupt |
120 | #define MOXA_MUST_IER_ECTSI 0x80 | 120 | #define MOXA_MUST_IER_ECTSI 0x80 |
121 | // eanble RTS interrupt | 121 | // enable RTS interrupt |
122 | #define MOXA_MUST_IER_ERTSI 0x40 | 122 | #define MOXA_MUST_IER_ERTSI 0x40 |
123 | // enable Xon/Xoff interrupt | 123 | // enable Xon/Xoff interrupt |
124 | #define MOXA_MUST_IER_XINT 0x20 | 124 | #define MOXA_MUST_IER_XINT 0x20 |
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index abb03e52fe12..fee2aca3f6a5 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c | |||
@@ -5996,7 +5996,7 @@ static void usc_set_async_mode( struct mgsl_struct *info ) | |||
5996 | * <15..8> ? RxFIFO IRQ Request Level | 5996 | * <15..8> ? RxFIFO IRQ Request Level |
5997 | * | 5997 | * |
5998 | * Note: For async mode the receive FIFO level must be set | 5998 | * Note: For async mode the receive FIFO level must be set |
5999 | * to 0 to aviod the situation where the FIFO contains fewer bytes | 5999 | * to 0 to avoid the situation where the FIFO contains fewer bytes |
6000 | * than the trigger level and no more data is expected. | 6000 | * than the trigger level and no more data is expected. |
6001 | * | 6001 | * |
6002 | * <7> 0 Exited Hunt IA (Interrupt Arm) | 6002 | * <7> 0 Exited Hunt IA (Interrupt Arm) |
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 905f58ba8e16..ea06e3a4dc35 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c | |||
@@ -2044,7 +2044,7 @@ static int __init edac_mc_init(void) | |||
2044 | */ | 2044 | */ |
2045 | clear_pci_parity_errors(); | 2045 | clear_pci_parity_errors(); |
2046 | 2046 | ||
2047 | /* Create the MC sysfs entires */ | 2047 | /* Create the MC sysfs entries */ |
2048 | if (edac_sysfs_memctrl_setup()) { | 2048 | if (edac_sysfs_memctrl_setup()) { |
2049 | edac_printk(KERN_ERR, EDAC_MC, | 2049 | edac_printk(KERN_ERR, EDAC_MC, |
2050 | "Error initializing sysfs code\n"); | 2050 | "Error initializing sysfs code\n"); |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 9aa074b44dd3..cc7ff8f00e42 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -812,7 +812,7 @@ static int nsc_ircc_init_39x(nsc_chip_t *chip, chipio_t *info) | |||
812 | int cfg_base = info->cfg_base; | 812 | int cfg_base = info->cfg_base; |
813 | int enabled; | 813 | int enabled; |
814 | 814 | ||
815 | /* User is shure about his config... accept it. */ | 815 | /* User is sure about his config... accept it. */ |
816 | IRDA_DEBUG(2, "%s(): nsc_ircc_init_39x (user settings): " | 816 | IRDA_DEBUG(2, "%s(): nsc_ircc_init_39x (user settings): " |
817 | "io=0x%04x, irq=%d, dma=%d\n", | 817 | "io=0x%04x, irq=%d, dma=%d\n", |
818 | __FUNCTION__, info->fir_base, info->irq, info->dma); | 818 | __FUNCTION__, info->fir_base, info->irq, info->dma); |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 8429ceb01389..b82191d2bee1 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -2283,7 +2283,7 @@ static void set_rx_mode(struct net_device *net_dev) | |||
2283 | int i, table_entries; | 2283 | int i, table_entries; |
2284 | u32 rx_mode; | 2284 | u32 rx_mode; |
2285 | 2285 | ||
2286 | /* 635 Hash Table entires = 256(2^16) */ | 2286 | /* 635 Hash Table entries = 256(2^16) */ |
2287 | if((sis_priv->chipset_rev >= SIS635A_900_REV) || | 2287 | if((sis_priv->chipset_rev >= SIS635A_900_REV) || |
2288 | (sis_priv->chipset_rev == SIS900B_900_REV)) | 2288 | (sis_priv->chipset_rev == SIS900B_900_REV)) |
2289 | table_entries = 16; | 2289 | table_entries = 16; |
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index ee48bfd67349..d1a86a080a65 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -513,7 +513,7 @@ struct mii_phy { | |||
513 | u_char *rst; /* Start of reset sequence in SROM */ | 513 | u_char *rst; /* Start of reset sequence in SROM */ |
514 | u_int mc; /* Media Capabilities */ | 514 | u_int mc; /* Media Capabilities */ |
515 | u_int ana; /* NWay Advertisement */ | 515 | u_int ana; /* NWay Advertisement */ |
516 | u_int fdx; /* Full DupleX capabilites for each media */ | 516 | u_int fdx; /* Full DupleX capabilities for each media */ |
517 | u_int ttm; /* Transmit Threshold Mode for each media */ | 517 | u_int ttm; /* Transmit Threshold Mode for each media */ |
518 | u_int mci; /* 21142 MII Connector Interrupt info */ | 518 | u_int mci; /* 21142 MII Connector Interrupt info */ |
519 | }; | 519 | }; |
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c index 55f4a9a631bc..ab985023fcca 100644 --- a/drivers/net/tulip/pnic2.c +++ b/drivers/net/tulip/pnic2.c | |||
@@ -199,7 +199,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5) | |||
199 | /* negotiation ended successfully */ | 199 | /* negotiation ended successfully */ |
200 | 200 | ||
201 | /* get the link partners reply and mask out all but | 201 | /* get the link partners reply and mask out all but |
202 | * bits 24-21 which show the partners capabilites | 202 | * bits 24-21 which show the partners capabilities |
203 | * and match those to what we advertised | 203 | * and match those to what we advertised |
204 | * | 204 | * |
205 | * then begin to interpret the results of the negotiation. | 205 | * then begin to interpret the results of the negotiation. |
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index cde35dd87906..c1ce87a5f8d3 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -208,7 +208,7 @@ static const struct typhoon_card_info typhoon_card_info[] __devinitdata = { | |||
208 | }; | 208 | }; |
209 | 209 | ||
210 | /* Notes on the new subsystem numbering scheme: | 210 | /* Notes on the new subsystem numbering scheme: |
211 | * bits 0-1 indicate crypto capabilites: (0) variable, (1) DES, or (2) 3DES | 211 | * bits 0-1 indicate crypto capabilities: (0) variable, (1) DES, or (2) 3DES |
212 | * bit 4 indicates if this card has secured firmware (we don't support it) | 212 | * bit 4 indicates if this card has secured firmware (we don't support it) |
213 | * bit 8 indicates if this is a (0) copper or (1) fiber card | 213 | * bit 8 indicates if this is a (0) copper or (1) fiber card |
214 | * bits 12-16 indicate card type: (0) client and (1) server | 214 | * bits 12-16 indicate card type: (0) client and (1) server |
@@ -788,7 +788,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
788 | /* we have two rings to choose from, but we only use txLo for now | 788 | /* we have two rings to choose from, but we only use txLo for now |
789 | * If we start using the Hi ring as well, we'll need to update | 789 | * If we start using the Hi ring as well, we'll need to update |
790 | * typhoon_stop_runtime(), typhoon_interrupt(), typhoon_num_free_tx(), | 790 | * typhoon_stop_runtime(), typhoon_interrupt(), typhoon_num_free_tx(), |
791 | * and TXHI_ENTIRES to match, as well as update the TSO code below | 791 | * and TXHI_ENTRIES to match, as well as update the TSO code below |
792 | * to get the right DMA address | 792 | * to get the right DMA address |
793 | */ | 793 | */ |
794 | txRing = &tp->txLoRing; | 794 | txRing = &tp->txLoRing; |
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 6fd0bf736830..8dfdfbd5966c 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
@@ -3858,7 +3858,7 @@ static int orinoco_ioctl_setscan(struct net_device *dev, | |||
3858 | unsigned long flags; | 3858 | unsigned long flags; |
3859 | 3859 | ||
3860 | /* Note : you may have realised that, as this is a SET operation, | 3860 | /* Note : you may have realised that, as this is a SET operation, |
3861 | * this is priviledged and therefore a normal user can't | 3861 | * this is privileged and therefore a normal user can't |
3862 | * perform scanning. | 3862 | * perform scanning. |
3863 | * This is not an error, while the device perform scanning, | 3863 | * This is not an error, while the device perform scanning, |
3864 | * traffic doesn't flow, so it's a perfect DoS... | 3864 | * traffic doesn't flow, so it's a perfect DoS... |
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index e5bb9f5ae429..989599ad33ef 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
@@ -747,7 +747,7 @@ prism54_get_essid(struct net_device *ndev, struct iw_request_info *info, | |||
747 | 747 | ||
748 | if (essid->length) { | 748 | if (essid->length) { |
749 | dwrq->flags = 1; /* set ESSID to ON for Wireless Extensions */ | 749 | dwrq->flags = 1; /* set ESSID to ON for Wireless Extensions */ |
750 | /* if it is to big, trunk it */ | 750 | /* if it is too big, trunk it */ |
751 | dwrq->length = min((u8)IW_ESSID_MAX_SIZE, essid->length); | 751 | dwrq->length = min((u8)IW_ESSID_MAX_SIZE, essid->length); |
752 | } else { | 752 | } else { |
753 | dwrq->flags = 0; | 753 | dwrq->flags = 0; |
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index 0ab26d01877b..0d2b447c50ed 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c | |||
@@ -1026,7 +1026,7 @@ static void twa_free_request_id(TW_Device_Extension *tw_dev, int request_id) | |||
1026 | tw_dev->free_tail = (tw_dev->free_tail + 1) % TW_Q_LENGTH; | 1026 | tw_dev->free_tail = (tw_dev->free_tail + 1) % TW_Q_LENGTH; |
1027 | } /* End twa_free_request_id() */ | 1027 | } /* End twa_free_request_id() */ |
1028 | 1028 | ||
1029 | /* This function will get parameter table entires from the firmware */ | 1029 | /* This function will get parameter table entries from the firmware */ |
1030 | static void *twa_get_param(TW_Device_Extension *tw_dev, int request_id, int table_id, int parameter_id, int parameter_size_bytes) | 1030 | static void *twa_get_param(TW_Device_Extension *tw_dev, int request_id, int table_id, int parameter_id, int parameter_size_bytes) |
1031 | { | 1031 | { |
1032 | TW_Command_Full *full_command_packet; | 1032 | TW_Command_Full *full_command_packet; |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 5996d3cd0ed8..674b15c78f68 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -1528,7 +1528,7 @@ static int serial8250_startup(struct uart_port *port) | |||
1528 | 1528 | ||
1529 | /* | 1529 | /* |
1530 | * Clear the FIFO buffers and disable them. | 1530 | * Clear the FIFO buffers and disable them. |
1531 | * (they will be reeanbled in set_termios()) | 1531 | * (they will be reenabled in set_termios()) |
1532 | */ | 1532 | */ |
1533 | serial8250_clear_fifos(up); | 1533 | serial8250_clear_fifos(up); |
1534 | 1534 | ||
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index b848b7d94412..3bdee64d1a99 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c | |||
@@ -483,7 +483,7 @@ static int serial_txx9_startup(struct uart_port *port) | |||
483 | 483 | ||
484 | /* | 484 | /* |
485 | * Clear the FIFO buffers and disable them. | 485 | * Clear the FIFO buffers and disable them. |
486 | * (they will be reeanbled in set_termios()) | 486 | * (they will be reenabled in set_termios()) |
487 | */ | 487 | */ |
488 | sio_set(up, TXX9_SIFCR, | 488 | sio_set(up, TXX9_SIFCR, |
489 | TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE); | 489 | TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE); |
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 9fe2283d91e5..1c4396c2962d 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
@@ -641,7 +641,7 @@ static int sunsu_startup(struct uart_port *port) | |||
641 | 641 | ||
642 | /* | 642 | /* |
643 | * Clear the FIFO buffers and disable them. | 643 | * Clear the FIFO buffers and disable them. |
644 | * (they will be reeanbled in set_termios()) | 644 | * (they will be reenabled in set_termios()) |
645 | */ | 645 | */ |
646 | if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) { | 646 | if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) { |
647 | serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO); | 647 | serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO); |
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 372527a83593..682bf2215660 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
@@ -158,7 +158,7 @@ static int ohci_s3c2410_hub_control ( | |||
158 | "s3c2410_hub_control(%p,0x%04x,0x%04x,0x%04x,%p,%04x)\n", | 158 | "s3c2410_hub_control(%p,0x%04x,0x%04x,0x%04x,%p,%04x)\n", |
159 | hcd, typeReq, wValue, wIndex, buf, wLength); | 159 | hcd, typeReq, wValue, wIndex, buf, wLength); |
160 | 160 | ||
161 | /* if we are only an humble host without any special capabilites | 161 | /* if we are only an humble host without any special capabilities |
162 | * process the request straight away and exit */ | 162 | * process the request straight away and exit */ |
163 | 163 | ||
164 | if (info == NULL) { | 164 | if (info == NULL) { |
diff --git a/drivers/usb/net/zaurus.c b/drivers/usb/net/zaurus.c index 9c5ab251370c..f7ac9d6b9856 100644 --- a/drivers/usb/net/zaurus.c +++ b/drivers/usb/net/zaurus.c | |||
@@ -217,7 +217,7 @@ static int blan_mdlm_bind(struct usbnet *dev, struct usb_interface *intf) | |||
217 | * with devices that use it and those that don't. | 217 | * with devices that use it and those that don't. |
218 | */ | 218 | */ |
219 | if ((detail->bDetailData[1] & ~0x02) != 0x01) { | 219 | if ((detail->bDetailData[1] & ~0x02) != 0x01) { |
220 | /* bmDataCapabilites == 0 would be fine too, | 220 | /* bmDataCapabilities == 0 would be fine too, |
221 | * but framing is minidriver-coupled for now. | 221 | * but framing is minidriver-coupled for now. |
222 | */ | 222 | */ |
223 | bad_detail: | 223 | bad_detail: |