aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/s2io.c2
-rw-r--r--drivers/s390/block/dasd_proc.c2
-rw-r--r--kernel/irq/spurious.c2
-rw-r--r--sound/synth/emux/soundfont.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index ddccf5fa56b6..075eedc7e768 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3238,7 +3238,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev)
3238 3238
3239/** 3239/**
3240 * s2io_chk_xpak_counter - Function to check the status of the xpak counters 3240 * s2io_chk_xpak_counter - Function to check the status of the xpak counters
3241 * @counter : couter value to be updated 3241 * @counter : counter value to be updated
3242 * @flag : flag to indicate the status 3242 * @flag : flag to indicate the status
3243 * @type : counter type 3243 * @type : counter type
3244 * Description: 3244 * Description:
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 654daa3cdfda..5f23eca82804 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -215,7 +215,7 @@ dasd_statistics_read(char *page, char **start, off_t off,
215 } 215 }
216 216
217 prof = &dasd_global_profile; 217 prof = &dasd_global_profile;
218 /* prevent couter 'overflow' on output */ 218 /* prevent counter 'overflow' on output */
219 for (factor = 1; (prof->dasd_io_reqs / factor) > 9999999; 219 for (factor = 1; (prof->dasd_io_reqs / factor) > 9999999;
220 factor *= 10); 220 factor *= 10);
221 221
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 114e704760fe..abd4fb77f8ce 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -230,7 +230,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
230 /* 230 /*
231 * If we are seeing only the odd spurious IRQ caused by 231 * If we are seeing only the odd spurious IRQ caused by
232 * bus asynchronicity then don't eventually trigger an error, 232 * bus asynchronicity then don't eventually trigger an error,
233 * otherwise the couter becomes a doomsday timer for otherwise 233 * otherwise the counter becomes a doomsday timer for otherwise
234 * working systems 234 * working systems
235 */ 235 */
236 if (time_after(jiffies, desc->last_unhandled + HZ/10)) 236 if (time_after(jiffies, desc->last_unhandled + HZ/10))
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c
index 63c8f45c0c22..67c91230c197 100644
--- a/sound/synth/emux/soundfont.c
+++ b/sound/synth/emux/soundfont.c
@@ -374,7 +374,7 @@ sf_zone_new(struct snd_sf_list *sflist, struct snd_soundfont *sf)
374 374
375 375
376/* 376/*
377 * increment sample couter 377 * increment sample counter
378 */ 378 */
379static void 379static void
380set_sample_counter(struct snd_sf_list *sflist, struct snd_soundfont *sf, 380set_sample_counter(struct snd_sf_list *sflist, struct snd_soundfont *sf,