diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/isicom.c | 4 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 478bf4d7d065..c105b9540ad8 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c | |||
@@ -245,7 +245,7 @@ static int lock_card(struct isi_board *card) | |||
245 | printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", | 245 | printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", |
246 | card->base); | 246 | card->base); |
247 | 247 | ||
248 | return 0; /* Failed to aquire the card! */ | 248 | return 0; /* Failed to acquire the card! */ |
249 | } | 249 | } |
250 | 250 | ||
251 | static int lock_card_at_interrupt(struct isi_board *card) | 251 | static int lock_card_at_interrupt(struct isi_board *card) |
@@ -262,7 +262,7 @@ static int lock_card_at_interrupt(struct isi_board *card) | |||
262 | spin_unlock_irqrestore(&card->card_lock, card->flags); | 262 | spin_unlock_irqrestore(&card->card_lock, card->flags); |
263 | } | 263 | } |
264 | /* Failing in interrupt is an acceptable event */ | 264 | /* Failing in interrupt is an acceptable event */ |
265 | return 0; /* Failed to aquire the card! */ | 265 | return 0; /* Failed to acquire the card! */ |
266 | } | 266 | } |
267 | 267 | ||
268 | static void unlock_card(struct isi_board *card) | 268 | static void unlock_card(struct isi_board *card) |
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index d2956010f763..311c4c541e01 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h | |||
@@ -360,7 +360,7 @@ struct bttv { | |||
360 | int mbox_csel; | 360 | int mbox_csel; |
361 | 361 | ||
362 | /* risc memory management data | 362 | /* risc memory management data |
363 | - must aquire s_lock before changing these | 363 | - must acquire s_lock before changing these |
364 | - only the irq handler is supported to touch top + bottom + vcurr */ | 364 | - only the irq handler is supported to touch top + bottom + vcurr */ |
365 | struct btcx_riscmem main; | 365 | struct btcx_riscmem main; |
366 | struct bttv_buffer *screen; /* overlay */ | 366 | struct bttv_buffer *screen; /* overlay */ |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index d6f6579cfd27..6734453ea28a 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -2134,7 +2134,7 @@ typedef struct scsi_qla_host { | |||
2134 | mempool_t *srb_mempool; | 2134 | mempool_t *srb_mempool; |
2135 | 2135 | ||
2136 | /* This spinlock is used to protect "io transactions", you must | 2136 | /* This spinlock is used to protect "io transactions", you must |
2137 | * aquire it before doing any IO to the card, eg with RD_REG*() and | 2137 | * acquire it before doing any IO to the card, eg with RD_REG*() and |
2138 | * WRT_REG*() for the duration of your entire commandtransaction. | 2138 | * WRT_REG*() for the duration of your entire commandtransaction. |
2139 | * | 2139 | * |
2140 | * This spinlock is of lower priority than the io request lock. | 2140 | * This spinlock is of lower priority than the io request lock. |